diff --git a/AUTHORS b/AUTHORS index da9328b..7d83b19 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,18 +15,26 @@ Daniel P. Berrange Dave Allan Doug Goldstein +Eduardo Lima (Etrunko) +Fabiano Fidêncio Guannan Ren Guido Günther Hans de Goede Jiri Denemark Jonathon Jongsma Ján Tomko +Lukas Venhoda Marc-André Lureau Martin Kletzander Michal Privoznik +Pavel Grunt +Pavel Hrdina Pavel Raiskup +Rex Dieter Richard W.M. Jones Ronnie Sahlberg +Sandy Stutsman +Victor Toso Yann E. MORIN" Yonit Halperin Zeeshan Ali (Khattak) diff --git a/ChangeLog b/ChangeLog index 4cc458a..38a6b73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,2578 @@ +2015-12-17 Daniel P. Berrange + + Update for release 3.1 + + Refresh translations from zanata + +2015-12-07 Daniel P. Berrange + + Refresh translations from zanata + +2015-12-03 Daniel P. Berrange + + Update NEWS for release 3.0 + + Bump spice-gtk dep to 0.30.0 to avoid dep on git snapshot release + + s/mingw62/mingw64/ in RPM spec file + + Avoid macro in RPM comment + +2015-12-01 Fabiano Fidêncio + + autobuild: gtk2 has been dropped for windows + 0a7fa73f is the commit that dropped support for gtk2 for the nsis + installer. + 03c014cb is the commit that dropped support for gtk2 for the msi + installer. + + specs: add remote-viewer-connect.xml + The file was introduced in commit 0571843d but never added to the spec + files. + + nsis: add libbz2-1.dll + mingw-bzip2 seems to be a mingw-freetype dependency. + + nsis: update nettle to 3.1.1 + Use version 3.1.1, matching what currently is in f23. + + nsis: update libgnutls to 3.4.7 + Use version 3.4.7, matching what currently is in f23. + + nsis: update pango to 1.38.1 + Use version 1.38.1, matching what is in f23. + An important note is that the removed files were removed in + mingw-pango-1.37.1. + + docs: fix "make syntaxcheck" + +2015-12-01 Jonathon Jongsma + + Add some multimonitor documentation + These two files describe some of the behavior and requirements for + virt-viewer in fullscreen multimonitor mode + +2015-11-05 Daniel P. Berrange + + autogen: Ensure m4 directory exists + We're telling autoconf to look in the m4/ directory for + files, but this directory doesn't exist in a clean checkout + until libtoolize has run. Older versions of autoconf consider + this to be a fatal error. + + git.mk: fix copyright line and remove use of -o / -a + Any copyright line must use 'Copyright (C) Red Hat' + per the syntax-check rule. + + Use of -a / -o args to "test" is non-portable and should + instead be done with 'test ... || test ...' + +2015-11-04 Eduardo Lima (Etrunko) + + Remove useless {get,set}_property functions + + Move declaration to the beginning of the file + + Update MAINTAINERCLEANFILES variables + Makefile.am: Use helper variables from git.mk + man/Makefile.am: This should be $(dist_man_MANS) instead of $(man_MANS) + + Update git.mk from latest upstream version + + Call intltoolize after autoreconf + After removing m4/.gitignore file in previous patch, I started getting + the following error when running autogen.sh. + + ln: failed to create symbolic link ‘m4/intltool.m4’: No such file or directory + cp: cannot create regular file ‘m4/intltool.m4’: No such file or directory + intltoolize: cannot copy '/usr/share/aclocal/intltool.m4' to 'm4/intltool.m4' + + The problem is that intltoolize requires te m4/ directory to be present, + and this directory is actually created by running autoreconf, so it + should be called before intltoolize. + + Remove m4/.gitignore file + All .gitignore files are handled by git.mk and should not be part of the + repository. + +2015-11-04 Pavel Grunt + + session-spice: Disable extra displays in fullscreen mode + When running in fullscreen it is possible to end up in a situation + where we have more displays enabled than monitors. This can happen + if displays that were enabled in the previous connection to the guest + doesn't match displays requested when entering the fullscreen mode. + + This commit solves the problem by disabling displays that should not be + enabled in the fullscreen mode. + + Resolves: rhbz#1212802 + + app: Do not map display to non-existent monitor + + app: Add helper for number of client monitors + +2015-10-21 Fabiano Fidêncio + + util: Fix the size of sorted_displays allocation + As sorted_displays is a vector containing all displays' order, its + allocation size must be the maximum display id + 1 instead of the + maximum display id. Also, fix the size used for sorting and iterating + the sorted_displays vector. + + Valgrind log: + ==15946== Invalid write of size 4 + ==15946== at 0x4169C0: virt_viewer_align_monitors_linear (virt-viewer-util.c:581) + ==15946== by 0x42248B: virt_viewer_session_on_monitor_geometry_changed (virt-viewer-session.c:438) + ==15946== by 0xBB41F03: _g_closure_invoke_va (gclosure.c:831) + ==15946== by 0xBB5BC7C: g_signal_emit_valist (gsignal.c:3214) + ==15946== by 0xBB5C764: g_signal_emit_by_name (gsignal.c:3401) + ==15946== by 0x4328F3: virt_viewer_display_spice_monitor_geometry_changed (virt-viewer-display-spice.c:93) + ==15946== by 0x432D60: virt_viewer_display_spice_size_allocate (virt-viewer-display-spice.c:224) + ==15946== by 0xBB41CD4: g_closure_invoke (gclosure.c:768) + ==15946== by 0xBB53538: signal_emit_unlocked_R (gsignal.c:3549) + ==15946== by 0xBB5BEEF: g_signal_emit_valist (gsignal.c:3305) + ==15946== by 0xBB5C29E: g_signal_emit (gsignal.c:3361) + ==15946== by 0x637D6F6: gtk_widget_size_allocate_with_baseline (gtkwidget.c:6093) + ==15946== Address 0x18c79d4c is 0 bytes after a block of size 12 alloc'd + ==15946== at 0x4C2A9C7: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) + ==15946== by 0xBDD36D1: g_malloc0 (gmem.c:127) + ==15946== by 0x41698D: virt_viewer_align_monitors_linear (virt-viewer-util.c:577) + ==15946== by 0x42248B: virt_viewer_session_on_monitor_geometry_changed (virt-viewer-session.c:438) + ==15946== by 0xBB41F03: _g_closure_invoke_va (gclosure.c:831) + ==15946== by 0xBB5BC7C: g_signal_emit_valist (gsignal.c:3214) + ==15946== by 0xBB5C764: g_signal_emit_by_name (gsignal.c:3401) + ==15946== by 0x4328F3: virt_viewer_display_spice_monitor_geometry_changed (virt-viewer-display-spice.c:93) + ==15946== by 0x432D60: virt_viewer_display_spice_size_allocate (virt-viewer-display-spice.c:224) + ==15946== by 0xBB41CD4: g_closure_invoke (gclosure.c:768) + ==15946== by 0xBB53538: signal_emit_unlocked_R (gsignal.c:3549) + ==15946== by 0xBB5BEEF: g_signal_emit_valist (gsignal.c:3305) + + Resolves: rhbz#1272650 + Related: rhbz#1267184 + + session: Only create a hashtable if apply_monitor_geometry vfunc exists + Creating the monitors hashtable only after checking for the existence of + apply_monitor_geometry vfunc avoids leaking the hashtable in the case + where the vfunc doesn't exist. + + Related: rhbz#1267184 + +2015-10-21 Pavel Grunt + + app: Use display id instead of 'this' in debug + +2015-10-20 Christophe Fergeau + + Stop polling after reconnecting to libvirtd + When the connection to libvirtd is lost, virt-viewer starts polling for + libvirtd to come back. The polling mechanism is also used when + connecting to very old libvirtd which don't support + virConnectDomainEventDeregisterAny(). + + Currently, once we could reconnect to libvirtd, virt-viewer will keep + polling, thus behaving as if the libvirtd connection does not support + virConnectDomainEventDeregisterAny(). This commit makes sure we stop + polling once the new libvirtd connection is established. + + This has the side-effect of preventing + https://bugzilla.redhat.com/show_bug.cgi?id=1271519 from occurring with + recent libvirt as it's caused by some race occurring when using the + polling code. + +2015-10-09 Jonathon Jongsma + + Use the display ID to configure fullscreen monitors + When starting virt-viewer in fullscreen mode, we generally try to + arrange guest displays exactly the same as client monitors. So if a + client machine has two monitors, we'll try to enable display 0 and 1 on + the guest (in that order). However, when using the configuration file to + map fullscreen displays to different monitors, the guest displays may + not be sequential, or there may be displays missing. For example, + consider the following configuration: + + monitor-mapping=1:2;2:1 + + In virt_viewer_session_spice_fullscreen_auto_conf(), we were building an + array of GdkRectangles for the initial monitors that we want to enable + on the guest. We then configured the guest displays using the index of + the array for the as the id of the guest display. But when displays + are sparse or are out-of-sequence, the array index will not match the + >ntended display ID. This created problems where displays were arranged + incorrectly. By changing the simple array into a GHashTable, we can keep + the display ID together with the GdkRectangle until we need to use it, + and things will be configured correctly. + + This regression was introduced by c586dc8c. + + Fixes: rhbz#1267184 + + SessionSpice: make main-window a property + Make "main-window" a construct-only property of VirtViewerSessionSpice. + This allows us to set it in the constructor and encapsulate all of the + setup within the gobject constructor rather than doing extra work in the + _new() function. + +2015-10-08 Fabiano Fidêncio + + msi: use the correct id for remote-viewer.exe + As, in theory, file ids are stables, seems that we have been using the + wrong id for remote-viewer.exe (not sure if since forever or if the path + changed). + That's what msidump shows: + + ffidenci@cat ~/src/upstream/virt-viewer/dump $ grep "fil808B4A5BAB4ACD727D3823632E798743" File.idt + ffidenci@cat ~/src/upstream/virt-viewer/dump $ grep "fil808B4A5BAB4ACD727D3823632E798743" Registry.idt + reg29E29C5608128A0192FB9DC3C18562A6 0 + VirtViewer.vvfile\shell\open\command + "[#fil808B4A5BAB4ACD727D3823632E798743]" "%1" CProgIds + ffidenci@cat ~/src/upstream/virt-viewer/dump $ grep "remote-viewer.exe" File.idt + fil610DF9E49759B1DEC646290195F96F8A cmp7677A8696936707272DCA43B1BF26760 + remote-viewer.exe 855735 512 837 + + So, let's use the correct id (fil610DF9E49759B1DEC646290195F96F8A) from + now on. + + Related: rhbz#1146016 + +2015-10-06 Fabiano Fidêncio + + msi: {virt,remote}-viewer depends on libxml2 + Currently libxml2 is pulled as an indirect dependency when virt-viewer + is built with support to ovirt or libvirt (pulled by rest or libvirt, + respectively). However, {virt,remote}-viewer itself depends on libxml2 + and not having it as an explicit dependency will cause errors on opening + remote-viewer when it is built without support to ovirt/libvirt. + +2015-09-10 Jonathon Jongsma + + Add new functions to enable/disable a display + Previously, there was a single function for controlling the enabled + state of a display: virt_viewer_display_set_enabled(). Unfortunately, + this function is used for two slightly different things: + + A. It informs the local display widget that the display has become + disabled or enabled on the server. In other words, it tries to + synchronize the 'enabled' state of the local widget with the actual + state of the remote display. + + OR + + B. It tries to actively enable a currently-disabled display (or vice + versa) due to some action by the user in the client application. + This causes the client to send a new configuration down to the + server. In other words, it tries to change the state of the remote + display. + + There is some conflict between these two scenarios. If the change is due + to a notification from the server, there is no need to send a new + configuration back down to the server, so this results in unnecessary + monitor configuration messages and can in fact cause issues that are a + little bit hard to track down. Because of this, I decided that it was + really necessary to have two separate functions for these two different + scenarios. so the existing _set_enabled() function will be used for + scenario A mentioned above. I added two new + functions (_enable() and _disable()) that are used to send new + configurations down to the server. + +2015-09-08 Jonathon Jongsma + + Set enabled status of all displays when we get a monitor update + Previously, when we received a new monitors update from the server, we + only called virt_viewer_display_set_enabled() for the displays that were + enabled. We simply assumed that those that were not enabled were already + set to disabled. This assumption is currently valid, but I have some + changes in the pipeline where this is not true. This change ensures that + we update the enabled state of all monitors when we get an updated + monitors conifguration. + + Don't emit 'monitor-geometry-changed' for disabled displays + When a display widget receives a new size allocation, we generally emit + a monitor-geometry-changed signal so that we can reconfigure the + displays. But if the widget for a *disabled* display is allocated, + there's no reason to send down a new configuration. We don't need to + emit this signal. This doesn't currently cause any problems, but I ran + into issues while testing some other uncommitted changes. + +2015-08-17 Fabiano Fidêncio + + coverity: result is not floating-point + Coverity says: + Result is not floating-point (UNINTENDED_INTEGER_DIVISION) + interger_division: Dividing integer expressions "preferred->width * 100" + and "zoom", and then converting the integer quotient to type double. Any + remainder, or fractional part of the quotient, is ignored. + +2015-08-13 Fabiano Fidêncio + + coverity: Copy into fixed sized buffer + Coverity says: + You might overrun the 108 byte fixed-size string "addr.sun_path" by + copying "unixsock" without checking the lenght. + Note: This detect has an elevated risk because the source argument is a + paramenter of the current function. + +2015-07-29 Pavel Grunt + + session-spice: Use display id instead of monitor id in debug log + Windows guests have monitor id = 0, so the debug log is always the same: + "creating spice display (#:0)" for all the displays. + + configure: Use default error message when package is missing + To make clear why configure failed - e.g.: + Package requirements (spice-client-gtk-2.0 >= 0.28) were not met + Requested 'spice-client-gtk-2.0 >= 0.28' but version of spice-client-gtk-2.0 is 0.25 + instead of + spice-gtk requested but not found + + Related: + https://bugzilla.redhat.com/show_bug.cgi?id=1214577 + + configure: Enable spice-gtk when have all necessary spice packages + When neither --with-spice-gtk=yes nor --with-spice-gtk=no is used, + spice-gtk is supposed to be automatically enabled/disabled depending + on its availability. However, this is not perfectly working as once + spice-gtk has been detected as available, configure will fail if + spice-protocol or spice-controller are too old. In this case, spice-gtk + support should just be disabled rather than configure failing + + virt-viewer-window: Change zoom with respect to real zoom + The zoom can be changed by resizing the window (VNC / Spice without + the agent). It is necessary to recalculate the zoom level before + changing it, otherwise zoom operations will not work correctly. + + Resolves: + https://bugs.freedesktop.org/show_bug.cgi?id=90582 + + Show window after its default and preferred sizes are set + Under some circumstances (Xfce desktop environment, gtk3 client, RHEL6 + guest having two monitors running locally) it is possible to create + a loop of resizing windows. It is caused by size request like 1x1 sent + to the guest. These request are created because _window_queue_resize() + is called when the window is being shown. + To avoid the problem, call gtk_widget_show() after its preferred and + default sizes are set. + + Resolves: + https://bugs.freedesktop.org/show_bug.cgi?id=91405 + +2015-07-22 Fabiano Fidêncio + + events: don't leak GIOChannel when destroying IO handle + virt_viewer_events_add_handle() creates a GIOChannel in order to watch the + fd it was given for changes. + virt_viewer_events_remove_handle() is freeing all the resources allocated by + virt_viewer_events_add_handle() except for this GIOChannel. This commit adds + the needed g_io_channel_unref() call to virt_viewer_events_remove_handle() + + Based on commit 8e95b8d25a3eee6316aff2f83b0c449aaf10984a from + libvirt-glib. + Original author: Christophe Fergeau + + Related to: rhbz#1243228 + + events: allow to remove disabled timers and handles + Trying to remove a disabled timer or handle will cause + virt_viewer_events_remove_{handle,timeout}() to return an error + rather than removing it. + + Based on commit 79699d73e6e1b7218e3bd8349d176752f86128b9 from + libvirt-glib. + Original author: Christophe Fergeau + + Related to: rhbz#1243228 + + events: don't create glib IO watch for disabled handles + It's possible to create a handle to watch for file events which do not + watch for any file event. Such a handle can be enabled later with + virt_viewer_events_update_handle() by setting some conditions to watch for. + + When a handle is disabled after it has been created, + virt_viewer_events_update_handle() makes sure it removes the corresponding + virt_viewer_events_handle::source IO watch if any was set. + virt_viewer_events_add_handle() will always create a + virt_viewer_events_handle::source IO watch even if the handle is not + watching for any events. + + This commit makes consistent by only creating a watch with g_io_add_watch() + when the caller asked to watch for some events. + + Based on commit d71c143936a35cd6c3f23ae0cbf7f3215d944051 from + libvirt-glib. + Original author: Christophe Fergeau + + Related to: rhbz#1243228 + + events: don't hold events lock when dispatching free callbacks + The _event_timeout_remove and _event_handle_remove methods + were holding onto the global lock when invoking the free + callback. This is a violation of the libvirt events API + contract which requires free callbacks to be invoked in + a re-entrant safe context. + + Based on commit dd17c3cc587c73a8c915238f9d9a3e200e89c93f from + libvirt-glib. + Original author: Daniel P. Berrange + + Related to: rhbz#1243228 + + events: don't reschedule deleted timeouts/watches + The deletion of libvirt timeouts/watches is done in 2 steps: + - the first step is synchronous and unregisters the timeout/watch + from glib mainloop + - the second step is asynchronous and triggered from the first step. + It releases the memory used for bookkeeping for the timeout/watch + being deleted + + This is done this way to avoid some possible deadlocks when + reentering the sync callback while freeing the memory associated + with the timeout/watch. + + However, it's possible to call gvir_event_update_handle after + gvir_event_remove_handle but before _event_handle_remove does + the final cleanup. When this happen, _update_handle will reregister + the handle with glib mainloop, and bad things will happen when + a glib callback is triggered for this event after _event_handle_remove + has freed the memory associated with this handle watch. + + This commit marks the timeouts and watches as removed in the + synchronous _remove callback and makes sure removed timeouts/watches + are ignored in _update callbacks. + + Based on commit 3e73e0cee977fb20dd29db3ccfe85b00cc386c43 from + libvirt-glib. + Original author: Christophe Fergeau + + Related to: rhbz#1243228 + + events: protect 'handles' and 'timeouts' against concurrent accesses + Timeout and watch deletion is done from an idle callback. However, + we cannot assume that all libvirt event calls (the callbacks passed + to virEventRegisterImpl) will be done from the mainloop thread. It's + thus possible that a libvirt event call will run a thread while + one of the idle deletion callbacks runs. + Given that the 'handles' and 'timeouts' arrays are shared among all + threads, we need to make sure we hold the 'eventlock' mutex before + modifying them. + + Based on commit 924178f6b35735458b37d30303fe7bc753dde0b1 from + libvirt-glib. + Original author: Christophe Fergeau + + Related to: rhbz#1243228 + + events: remove unused virt_viewer_events_find_{handle,timeout} arg + Based on commit 1fb34633ef3b318ea678b775d5e47debc98d2184 from + libvirt-glib. + Original author: Christophe Fergeau + + Related to: rhbz#1243228 + + events: allow zero timeouts for timer + In libvirt, it's perfectly possible and widely used to have disabled + timers (timeout=-1) and fire them up 'randomly' with timeout=0. + However, with current mapping into glib mainloop it's not possible + and causing troubles. + + Based on commit a40a1732e0d53fcc44b8d348cec97152dafd2b88 from + libvirt-glib. + Original author: Michal Privoznik + + Related to: rhbz#1243228 + + glib-compat: Use g_new0(GMutex, 1) if GLib >= 2.31 + Since 2.31, g_mutex_new() is deprecated. + + Based on commit 2dc7476d32a9e158e688486e8f184c719c53bb4c from + libvirt-glib. + Original author: Daniel P. Berrange + + Related to: rhbz#1243228 + + glib-compat: group definitions and functions + There is no need to have more than one glib version checking for the + same version, in the same file. Let's just group them all. + + events: remove timeout and handle from arrays + Otherwise, it will crash next time it goes find() + + Backtrace: + (gdb) where + #0 0x00007efcae715095 in g_io_create_watch () from + /lib64/libglib-2.0.so.0 + #1 0x00007efcae7150ef in g_io_add_watch_full () from + /lib64/libglib-2.0.so.0 + #2 0x00000000004275ba in virt_viewer_events_update_handle + (watch=, events=1) at + virt-viewer-events.c:158 + #3 0x00007efcb1a62dce in virNetSocketUpdateIOCallback (sock=0x1e75c00, + events=1) at rpc/virnetsocket.c:1981 + #4 0x00007efcb1a50113 in virNetClientIOUpdateCallback + (client=, enableCallback=) at + rpc/virnetclient.c:1639 + #5 0x00007efcb1a50f82 in virNetClientIO (thiscall=0x20e0170, + client=0x1f2e060) at rpc/virnetclient.c:1793 + #6 virNetClientSendInternal (client=client@entry=0x1f2e060, + msg=msg@entry=0x20e0100, + expectReply=expectReply@entry=false, nonBlock=nonBlock@entry=true) at + rpc/virnetclient.c:1962 + #7 0x00007efcb1a52413 in virNetClientSendNonBlock (client=0x1f2e060, + msg=msg@entry=0x20e0100) at + rpc/virnetclient.c:2036 + #8 0x00007efcb1a5243d in virNetClientKeepAliveSendCB (opaque=, msg=0x20e0100) at + rpc/virnetclient.c:293 + #9 0x00007efcb1a5ba02 in virKeepAliveTimer (timer=, + opaque=0x20d3d00) at rpc/virkeepalive.c:176 + #10 0x00000000004272e9 in virt_viewer_events_dispatch_timeout + (opaque=0x1e6cd30) at virt-viewer-events.c:233 + #11 0x00007efcae7231b3 in g_timeout_dispatch () from + /lib64/libglib-2.0.so.0 + #12 0x00007efcae72279a in g_main_context_dispatch () from + /lib64/libglib-2.0.so.0 + #13 0x00007efcae722ae8 in g_main_context_iterate.isra.24 () from + /lib64/libglib-2.0.so.0 + #14 0x00007efcae722dba in g_main_loop_run () from + /lib64/libglib-2.0.so.0 + #15 0x00007efcb054a045 in gtk_main () from /lib64/libgtk-3.so.0 + #16 0x0000000000410a9c in main (argc=1, argv=0x7ffde58a7978) at + virt-viewer-main.c:124 + + Based on commit cff5f1c46f4b9661e112b85159fb58ae473a9a89 from + libvirt-glib. + Original author: Marc-André Lureau + + Related to: rhbz#1243228 + + events: register event using GOnce to avoid multiple initializations + Based on commit 8f8d9ce5238dbcbce40aa04ba55b8c55f97c79c0 from + libvirt-glib. + Original author: Marc-André Lureau + + Related to: rhbz#1243228 + + events: ensure event callbacks are threadsafe + Take a global lock whenever changing any event callbacks to ensure + thread safety. + + Based on commit f1fe67da2dac6a249f796535b8dbd155d5741ad7 from + libvirt-glib. + Original author: Daniel P. Berrange + + Related to: rhbz#1243228 + +2015-07-22 Pavel Grunt + + virt-viewer-window: Allow to resize window to any size + The function virt_viewer_window_resize restricts window to be bigger + than a client's screen. It avoids extending the window to more client's + screens, it causes changes of the zoom level if the guest does not fit + into a screen. + + Lets remove virt_viewer_window_resize (its behaviour was introduced + by the commit 6acb3856b6d8007752388f22f97aa8aaffdb7a5e). It will let + the window managers to handle resizing of the window. + + Resolves: + https://bugzilla.redhat.com/show_bug.cgi?id=1221501 + https://bugzilla.redhat.com/show_bug.cgi?id=1205804 + + Remove unnecessary parameter from virt_viewer_window_resize() + Since c3cbdef888cc823e92140027d38378f40ccd4174 virt_viewer_window_resize + is always called with keep_win_size = FALSE. + +2015-07-09 Pavel Hrdina + + virt-viewer: set keepAlive on libvirt connection + Setting the keepAlive on libvirt connection is needed in order to + receive the CloseCallback event. + + Resolves: rhbz#1164052 + +2015-06-30 Jonathon Jongsma + + Build an intermediate convenience library + Instead of building every single source file twice (once for + virt-viewer, and once for remote-viewer), just build them into a + temporary library and link the final executables against that. + + The one possible drawback to this approach is that we now use the same + log domain for both executables: 'virt-viewer'. Previously, the + remote-viewer executable used 'remote-viewer' for its log domain. + + Build: put one file on a line + For easier maintenance, put a single source file per-line in the + makefile + + Remove spice-controller flags from virt-viewer build + Virt-viewer does not use spice-controller, only remote-viewer does. So + there's no need to ad SPICE_CONTROLLER_CFLAGS to the virt-viewer build. + +2015-06-24 Fabiano Fidêncio + + mingw,spec: Fix mingw-gstreamer1-plugins-bad-free name + The package was created with a wrong name (mingw-gstreamer1-plugins-bad) + and then fixed (mingw-gstreamer1-plugins-bad-free) for f22 and newer. + +2015-06-23 Fabiano Fidêncio + + msi: drop gtk2 support + As virt-viewer builds for Windows are using GTK3 nowadays, we can easily + drop GTK2 support and avoid maintenance effort in something that is not + used/tested anymore. + + nsis: drop gtk2 support + As virt-viewer builds for Windows are using GTK3 nowadays, we can easily + drop GTK2 support and avoid maintenance effort in something that is not + used/tested anymore. + + mingw-spec: Update msitools dependency + The new msitools release includes the necessaries changes for fixing + mingw-virt-viewer build (on fedora22). + + These fixes are: + - an updated libvirt.wxi, removing storageencryption.rng file + - a new included libeproxy.wxi, a new dep for gtk3 since its 3.15.3 + version. + + nsis: add libepoxy-0.dll (a new gtk3 dependency) + The new dependecy was introduced in gtk+ 3.15.3. + +2015-06-19 Jonathon Jongsma + + Don't wait for reconnect when user cancels auth + When starting virt-viewer with the --reconnect switch to a guest that + has a password, if the user cancels the authentication dialog (e.g. + pressing 'Esc'), the window will display "Waiting for guest domain to + restart". Obviously, the domain will never restart because it's already + running. + + After this fix, the application will simply exit when the user cancels + authentication, even if the --reconnect switch is used. + + Automatically retry auth failures for VNC + There's no reason that we need to ask if the user wants to retry auth + failures for VNC sessions but not ask for spice sessions. If the user + doesn't want to retry, she can simply click 'cancel' when the auth + dialog pops up, just as they do with spice. + + VNC session: emit session-cancelled signal + When the user cancells an authentication dialog (e.g. by pressing 'Esc', + emit the session-cancelled signal to be consistent with the spice + session implementation. + + Rename session-auth-failed to session-auth-unsupported + Now that VNC and Spice both return the same signal on normal + authentication failures ('session-auth-refused'), the + 'session-auth-failed' signal is too confusingly similar. Rename it to + -unsupported to make it obvious that it's a different type of + (unrecoverable) error. + + Fix inconsistencies in session auth failures + The spice session implementation can retry authentication on its own, + whereas the vnc session needs to tear down the session and re-connect in + order to retry a failed authentication. This results in the following + inconsistent behavior: + + VNC session: + - emits a 'session-auth-failed' signal when the client does not support + a particular authentication type (i.e.: a non-recoverable error) + Spice session: + - emits a 'session-auth-failed' signal when user enters an incorrect + password, and immediately retries auth internally + + VNC session: + - emits a 'session-auth-refused' error when user enters an invalid + password (i.e.: a recoverable error) + Spice Session: + - never emits a 'session-auth-refused' signal + + Because of these differences, the VirtViewerApp code to handle authentication + failures is a bit confusing and difficult to maintain. To fix this issue, make + both the spice and VNC sessions emit the same signal when similar errors occur. + We use the new session API added in the last commit to determine whether the + session supports automatic retries so we know how to handle the signal. + + Session: add vfunc to check auth retry capability + The spice session implementation can retry authentication on its own, + whereas the vnc session needs to tear down the session and re-connect in + order to retry a failed authentication. Add API to determine this so + that we can clean up some code related to authentication failures. + + Move SpiceSession setup to create_spice_session() + Most of the setup (connecting to signals, etc) for the SpiceSession was + done in create_spice_session(), but some was done afterwards in + virt_viewer_session_spice_new(). Consolidate all session configuration + in one place. + + In addition to making it easier to maintain, create_spice_session() is + also called in virt_viewer_session_spice_close(). which results in a + spice session that is configured slightly differently than the first + session created in _new(). Consolidating everything in + create_spice_session() avoids that inconsistency. + +2015-06-19 Daniel P. Berrange + + Add config.h include to remote-viewer-connect.c file + +2015-06-16 Lukas Venhoda + + remote-viewer-connect: Address entry is now required + Connect button is now non-sensitive when address entry is empty. + Pressing enter will now also NOT connect, when address entry is empty. + + remote-viewer-connect: Fixed reselecting in recent chooser + Recent chooser didn't unselect on loosing focus. + Selecting recent connection, then modifying address in entry and + doubleclicking on the same recent connection caused remote-viewer to + connect to address in the entry, + + Recent chooser now unselects on loosing focus, forcing to re-select when + doubleclicking the recent connection, which will now properly set the + address to connect to. + + remote-viewer-connect: Changed hardcoded UI into XML + Hardcoded UI removed in favor of XML. + Added the new XML file for translation. + + remote-viewer-connect: Changed dialog into a window + Changed connect dialog from GtkDialog to a GtkWindow. + Added the necessary signals and buttons, to keep the + behaviour of a dialog. (ESC to close, ENTER to submit) + + remote-viewer-connect: Check if uri is NULL + URI should be NULL before passing it to remote_viewer_connect_dialog. + + remote-viewer-connect: Changed response to gboolean + remote_viewer_connect_dialog now returns TRUE and FALSE, instead of 0 and -1. + + Added a doxygen style comment to document this in code also. + + remote-viewer: Connect dialog moved to its own file + Connect dialog from remote-viewer is now in its own file. + Most other dialog also have their own files. + This will make changing the dialog into a window easier. + + Renamed connect_dialog to remote_viewer_connect_dialog. + +2015-06-16 Pavel Grunt + + configure: Require spice-protocol 0.12.7 + We are already using SPICE_CHANNEL_WEBDAV from spice/enums.h + +2015-06-15 Christophe Fergeau + + Enable hotkeys after setting them in virt_viewer_app_set_hotkeys + Enabling hotkeys will trigger a rebuild of the 'send keys' menu + containing the new hotkeys. virt_viewer_app_set_hotkeys() was clearing + and then enabling the hotkeys before parsing the string containing the + new hotkeys. This was causing these hotkeys to be missing from the 'Send + keys' menu when they are set through the spice controller because the + 'send keys' menu was rebuilt before the new hotkeys are set. + + Resolves: rhbz#1055600 + +2015-06-11 Fabiano Fidêncio + + nsis: Ship libwinpthread even without libvirt support + Without libwinpthread, remote-viewer complains about missing this dll, + when built using --without-libvirt + +2015-06-10 Sandy Stutsman + + Add InstallScope="perMachine" to virt-viewer.wxs.in + Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1146016 + Without this parameter the installer will place the start menu icon in the + Admin users path rather than the 'AllUsers'. Unprivileged users are unable + to use the menu to start the remote-viewer. + + N.B. Because previous installations mixed Users and PerMachine (AllUsers) + paths, this installation will *NOT* properly upgrade them. They must be + manually uninstalled first. + +2015-06-10 Daniel P. Berrange + + Add missing config.h header file + +2015-06-09 Christophe Fergeau + + vv-file: Show 'newer-version-url' when version check fails + We currently display a generic error message when the current binary is + older than the minimum version specified in the vv file. The previous + commit added a 'newer-version-url' field to these .vv file. This commit + adds that URL to the error message if it's set. + + vv-file: Add 'newer-version-url' key to .vv files + If set, this URL will be displayed when one of the version checks + ('version' of 'versions' key fail). This URL should contain explanations + about how to get an updated remote-viewer version. + + test: Add test case for virt_viewer_compare_buildid + + util: Replace virt_viewer_compare_version with _compare_buildid + This allows us to do a more accurate version check if the .vv file + producer wants to allow builds newer than x.y-z because they contain an + important bug fix. + + vv-file: Use "versions" in min version check + This tries to use the list of versions added to .vv files by the + previous commit. If remote-viewer was built with an os-id specified, and + if it's found in the 'versions' .vv file key, then the version + associated with it is used for version checks, otherwise the 'version' + field is used if present. + + Show osid in remote-viewer --version + + build-sys: Add --with-osid + This new configure flag allows to specify a string ID (eg fedora22, + ubuntu10.04, ..) identifying the OS this remote-viewer build will be + for. This will be used in combination with the new 'versions' field in + .vv files in order to make it possible for the creator of the .vv file + to specify which version it expects for the various OSes which may + connect. + + vv-file: Add VirtViewerFile::versions + Specifying a single minimal version in the .vv file is not enough as + the client version will be highly dependent on the OS it's running in. + Windows versioning is not the same as linux versioning, Fedora 21 and + Fedora 22 may have different release numbers for the same version, + and we may want to force a specific minimal release in case of a + critical bug fix. + + This commit adds supports for a 'versions' field in .vv files where a + list of os-id:version couples can be stored. + + vv-file: Refactor virt_viewer_file_check_min_version + Reorganize the code a bit so that it's easier to extend it. + + vv-file: Move version checking code in its own function + This moves the version checking code in a + virt_viewer_file_check_min_version helper so that it can be + reused/extended more easily. + + build-sys: Always prepend '-' to BUILDID + This was removed by commit 28a6bd6 as WINDOWS_PRODUCTVERSION + needs a buildid without a dash. Apart from this variable, + all other uses of buildid/BUILDID in virt-viewer source tree + need a dash between the version number and the buildid to avoid getting + output like "3.01" instead of "3.0-1" + + Rather than patching every location where BUILDID is used, this commit + appends the "-" before substituting/defining BUILDID in configure.ac. + This does not modifies the buildid configure.ac variable, this way + WINDOWS_PRODUCTVERSION won't get an unwanted '-'. + + build-sys: Don't substitute buildid when it was not set + Since it defaults to being 0, we'll get a spurious 0 on remote-viewer + --version if we AC_DEFINE/AC_SUBST it when the user did not specify it. + +2015-06-04 Pavel Grunt + + monitor-mapping: Do not allow to skip a display + Skipping a display does not have an effect because displays will be + reconfigured and shifted on the guest side anyway. + + these monitor mappings are not valid: + 'monitor-mapping=1:2;3:1' - display #2 is not specified + 'monitor-mapping=4:2;2:1' - displays #1, #3 are not specified + 'monitor-mapping=3:3' - displays #1, #2 are not specified + +2015-06-02 Fabiano Fidêncio + + session-spice: Only update displays geometry if the agent is connected + +2015-05-21 Lukas Venhoda + + virt-viewer: Fix choose VM dialog alt-tab in gnome2 + Choose VM dialog was not visible in taskbar and alt-tab when running on + system with gnome2. + + rhbz#1223285 + +2015-05-21 Fabiano Fidêncio + + Revert "display-vnc: fix zoom-level set by command line" + This reverts commit 68148e1bd1a47ff370c78e2569a57ae0f3d8a400. + + The commit in question was causing a regression about a tiny window + being displayed when opening a vnc guest. + The issue only happens with the gtk2 version of virt-viewer. + + rhbz#1170071 that was solved by the reverted commit is avoided by + the commit c45a30e909656434aa842d48d828ef038ec7364a. + + Resolves: rhbz#1201679 + +2015-05-21 Pavel Grunt + + session-vnc: Set window for display to avoid gtk-vnc v0.3.8 crash + The VNC display widget of gtk-vnc v0.3.8 needs a window at the moment + it is initialized otherwise it would crash. + + Resolves: rhbz#1196517 + +2015-05-21 Lukas Venhoda + + virt-viewer-display-vnc: Set uuid when using VNC + Notify user, that VNC does not provide uuid. + + Set uuid to string "VNC does not provide guid". + This is more informative then just plain "Unknown". + User will now know WHY the GUID is unknown, when using remote-viewer. + + virt-viewer-display-vnc: Set guest name when using VNC + If it's not already set, set guest name field in virt-viewer-app when using VNC. + + Wait for VNC to be initialized (virt_viewer_display_vnc_initialized()). + In this callback get field guest name from app and check whether it + was already set before (FE from libvirt). + If not, set the guest name to name provided by VNC from + vnc_display_get_name(). + + This fill fix issue in remote-viewer: Guest name is Unknown when using VNC. + +2015-04-29 Michal Privoznik + + Fix syntax-check + Commit c45a30e9 broke syntax-check: + + trailing_blank + src/virt-viewer-window.c:1478: + maint.mk: found trailing blank(s) + maint.mk:700: recipe for target 'sc_trailing_blank' failed + make: *** [sc_trailing_blank] Error 1 + +2015-04-22 Pavel Grunt + + virt-viewer-window: Set initial zoom only once + It is not needed to do it more times as it may cause unnecessary resize + events especially when leaving the fullscreen mode + + related: rhbz#1206460 + + virt-viewer-window: Make sure that minimum zoom level is lower than NORMAL_ZOOM_LEVEL + The minimum size of the desktop is 100x100 if the minimum window size + is greater than this, the zoom level is greater than NORMAL_ZOOM_LEVEL + + related: rhbz#1206460 + +2015-04-22 Lukas Venhoda + + virt-viewer: Set toolbar buttons not sensitive when needed + File->Screenshot, File->Preferences, View->Zoom and Send keys are now + sensitive only while quest is connected. + + Changed behaviour of zoom: + + Previously, zoom could be set while quest wasn't connected. The zoom + would then be set on connection. There was no indication of current zoom + level while not connected to guest. + + Now, the menu is not sensitive while not connected to guest. Zoom can + now be only modified while connected to guest, or from the command line. + + app/window: Set display menu not sensitive when needed + Displays menu must be sensitive only when at least one display is + enabled. + +2015-04-22 Fabiano Fidêncio + + cosmetic: move the "break" to inside the {} block + + spice-session: use the error message, when available, on _channel_destroy() + + session-spice: Destroy the channel instead of emit a "session-disconnect" signal + Whenever we reach these branches, we will abort or have to create a new + spice session (from the dialog showed to the user). So, destroying the + channel on these situations seems sane enough. + It also avoids an error dialog to be popped out twice with (basically) + the same information. + + session-spice: Do not use _UNUSED for used attributes + channel attribute is actually used for error treatment + + display: remove useless identation level + +2015-04-15 Jonathon Jongsma + + SessionSpice: Protect against unreffing window twice + In theory, the dispose method can be called multiple times, so any + member variables that are unreffed should be set to NULL so that we + don't accidentally unref them multiple times. + +2015-04-15 Christophe Fergeau + + build-sys: Ship mingw-virt-viewer.spec in tarballs + virt-viewer.spec is already shipped in tarballs, it's convenient to have + a pregenerated mingw-virt-viewer.spec in there as well. + +2015-04-14 Pavel Grunt + + virt-viewer-main: '--wait' should not be used without domain name + Commit a830275344c88aef12166661b68ea2b4429c7212 required the domain + name to be placed just after the '--wait' option. It broke the + command line api, because running 'virt-viewer $vm --wait' was considered + as the error. + + This patch rather checks whether the domain name was specified. + + Related: rhbz#1209398, rhbz#1211573 + + Revert "virt-viewer-main: Require domain name as argument for '--wait'" + This reverts commit a830275344c88aef12166661b68ea2b4429c7212. + + Commit a830275344c88aef12166661b68ea2b4429c7212 required the domain + name to be placed just after the '--wait' option. It broke the + command line api, because running 'virt-viewer $vm --wait' was considered + as the error. + + Related: rhbz#1209398, rhbz#1211573 + + Revert "man: document that '--wait' requires domain as parameter" + This reverts commit 9ba2d28a0f35b69befd26d7c122bbe4cd626422f. + + Commit a830275344c88aef12166661b68ea2b4429c7212 required the domain + name to be placed just after the '--wait' option. It broke the + command line api, because running 'virt-viewer $vm --wait' was considered + as the error. + + Related: rhbz#1209398, rhbz#1211573 + + Revert "virt-viewer-main: exit when domain names doesn't match" + This reverts commit 10264d0d1ecbd67d3e59e3a1a3032936b0635eda. + + Commit a830275344c88aef12166661b68ea2b4429c7212 required the domain + name to be placed just after the '--wait' option. It broke the + command line api, because running 'virt-viewer $vm --wait' was considered + as the error. + + Related: rhbz#1209398, rhbz#1211573 + + virt-viewer-main: exit when domain names doesn't match + Since the domain name is required as a parameter for the '--wait' + option (commit a830275344c88aef12166661b68ea2b4429c7212 ), it is + neccessary to check whether all domains names are the same. Otherwise + it wouldn't be clear which name should be used. + + related: rhbz#1211573 + + man: document that '--wait' requires domain as parameter + related: rhbz#1211573 + + man: document usage of domain name as optional + related: rhbz#1211573 + + ovirt: Allow to cancel authentication without showing error dialog + Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1201604 + +2015-04-09 Christophe Fergeau + + ovirt: Add support for an 'admin' key in vv file + When using a user with administrator rights, the VMs this user can + access from the user portal and the admin portal are different, and + REST API users must indicate which set of VMs they want through a + specific header. libgovirt already has support for that in its API, but + virt-viewer was not making use of that API. + This commit adds support for an 'admin' field in the [ovirt] section of + .vv files so oVirt can indicate remote-viewer whether this header should + be set or not. + +2015-04-09 Pavel Grunt + + virt-viewer-app: Do not show error dialog twice for unknown graphic + Related: rhbz#1085216 + +2015-04-09 Jonathon Jongsma + + Cleanup: only add display when it's created + This wasn't causing any problems because the _add_display() function has + an early return for the case that the display has already been added to + the session, but it's quite confusing when reading the code to see this + _add_display() function being called for every display every time we get + a monitor configuration update. + + Emit one show-hint notification when enabling a display + Freeze notifications before setting the show hints to prevent multiple + notification signals from being emitted. + +2015-04-09 Pavel Grunt + + display-spice: Do not ignore change of position + Positions of displays can be changed by guest, it is important to + react to this change by rearranging client's windows otherwise + mouse actions can be assigned to a wrong window. + + Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1206216 + + virt-viewer-window: Return early when zoom of window and zoom of display are same + The zoom level should be changed when zoom levels of the window and + the display are different. It is wrong to check the previous value of + the window because it could be set just for the window and not for + the display (e.g. when setting zoom level using the command line). + + Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1206460 + + virt-viewer-window: Set zoom when display is enabled and ready. + The display has default dimensions (100x100) when it is disabled. + Calculating the minimal zoom for the display will give wrong value + for the newly opened display. + + It is better to wait for setting the zoom level to the moment when + the display is enabled and ready. + + Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1206460 + +2015-04-07 Pavel Grunt + + virt-viewer-main: Require domain name as argument for '--wait' + As since 88f634179e56742a21fb4c7efc270e4203322d74 virt-viewer can be + used without a domain-name, let's require it when using --wait. + + Resolves: rhbz#1209398 + +2015-04-07 Christophe Fergeau + + Fix leak in virt_viewer_session_spice_clear_displays() + The GList returned by spice_session_get_channels() must be freed after + use. + +2015-04-03 Fabiano Fidêncio + + Fix crash when disabling last enabled display + Using virt_viewer_signal_connect_object() instead of g_signal_connect() + ensures that menu_display_visible_toggled_cb() won't be executed after + the display object be disposed. + + Backtrace for the crash: + + #0 0x00007ffff070592b in g_type_check_instance_is_a (type_instance=0x8851f0, iface_type=) at gtype.c:4016 + #1 0x000000000041ee06 in virt_viewer_display_get_session (self=0x8851f0) at ../../src/virt-viewer-display.c:702 + #2 0x0000000000417be7 in menu_display_visible_toggled_cb (checkmenuitem=0x93f790 [GtkCheckMenuItem], display=0x8851f0) at ../../src/virt-viewer-app.c:2187 + #6 0x00007ffff06fe29f in (instance=instance@entry=0x93f790, signal_id=, detail=detail@entry=0) at gsignal.c:3361 + #3 0x00007ffff06e3b9f in g_closure_invoke (closure=0x93faa0, return_value=return_value@entry=0x0, n_param_values=1, param_values=param_values@entry=0x7fffffffc230, invocation_hint=invocation_hint@entry=0x7fffffffc1b0) at gclosure.c:768 + #4 0x00007ffff06f54c9 in signal_emit_unlocked_R (node=node@entry=0x6d73e0, detail=detail@entry=0, instance=instance@entry=0x93f790, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffc230) at gsignal.c:3549 + #5 0x00007ffff06fded0 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffc3f0) at gsignal.c:3305 + #7 0x00007ffff5eb6158 in gtk_check_menu_item_activate (check_menu_item=0x93f790 [GtkCheckMenuItem]) at gtkcheckmenuitem.c:299 + #8 0x00007ffff5eb6158 in gtk_check_menu_item_activate (menu_item=0x93f790 [GtkCheckMenuItem]) at gtkcheckmenuitem.c:419 + #12 0x00007ffff06fe29f in (instance=, signal_id=, detail=) at gsignal.c:3361 + #9 0x00007ffff06e3b9f in g_closure_invoke (closure=closure@entry=0x6d5aa0, return_value=return_value@entry=0x0, n_param_values=1, param_values=param_values@entry=0x7fffffffc6b0, invocation_hint=invocation_hint@entry=0x7fffffffc630) at gclosure.c:768 + #10 0x00007ffff06f51bd in signal_emit_unlocked_R (node=node@entry=0x6d5ba0, detail=detail@entry=0, instance=instance@entry=0x93f790, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffc6b0) at gsignal.c:3479 + #11 0x00007ffff06fded0 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffc870) at gsignal.c:3305 + #13 0x0000000000417c5e in menu_display_visible_toggled_cb (checkmenuitem=0x93f790 [GtkCheckMenuItem], display=0x8851f0) at ../../src/virt-viewer-app.c:2200 + #17 0x00007ffff06fe29f in (instance=instance@entry=0x93f790, signal_id=, detail=detail@entry=0) at gsignal.c:3361 + #14 0x00007ffff06e3c45 in g_closure_invoke (closure=0x93faa0, return_value=return_value@entry=0x0, n_param_values=1, param_values=param_values@entry=0x7fffffffcb50, invocation_hint=invocation_hint@entry=0x7fffffffcad0) at gclosure.c:768 + #15 0x00007ffff06f54c9 in signal_emit_unlocked_R (node=node@entry=0x6d73e0, detail=detail@entry=0, instance=instance@entry=0x93f790, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffcb50) at gsignal.c:3549 + #16 0x00007ffff06fded0 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffcd10) at gsignal.c:3305 + #18 0x00007ffff5eb6158 in gtk_check_menu_item_activate (check_menu_item=0x93f790 [GtkCheckMenuItem]) at gtkcheckmenuitem.c:299 + #19 0x00007ffff5eb6158 in gtk_check_menu_item_activate (menu_item=0x93f790 [GtkCheckMenuItem]) at gtkcheckmenuitem.c:419 + #23 0x00007ffff06fe29f in (instance=instance@entry=0x93f790, signal_id=, detail=detail@entry=0) at gsignal.c:3361 + #20 0x00007ffff06e3c45 in g_closure_invoke (closure=closure@entry=0x6d5aa0, return_value=return_value@entry=0x0, n_param_values=1, param_values=param_values@entry=0x7fffffffcfd0, invocation_hint=invocation_hint@entry=0x7fffffffcf50) at gclosure.c:768 + #21 0x00007ffff06f51bd in signal_emit_unlocked_R (node=node@entry=0x6d5ba0, detail=detail@entry=0, instance=instance@entry=0x93f790, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffcfd0) at gsignal.c:3479 + #22 0x00007ffff06fded0 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffd190) at gsignal.c:3305 + #24 0x00007ffff608648e in IA__gtk_widget_activate (widget=widget@entry=0x93f790 [GtkCheckMenuItem]) at gtkwidget.c:5048 + #25 0x00007ffff5f6cacd in IA__gtk_menu_shell_activate_item (menu_shell=0x70ece0 [GtkMenu], menu_item=0x93f790 [GtkCheckMenuItem], force_deactivate=) at gtkmenushell.c:1303 + #26 0x00007ffff5f6ce96 in gtk_menu_shell_button_release (widget=0x70ece0 [GtkMenu], event=) at gtkmenushell.c:730 + #31 0x00007ffff06fe29f in (instance=instance@entry=0x70ece0, signal_id=, detail=detail@entry=0) at gsignal.c:3361 + #27 0x00007ffff5f578ad in _gtk_marshal_BOOLEAN__BOXED (closure=0x6c7180, return_value=0x7fffffffd4e0, n_param_values=, param_values=0x7fffffffd540, invocation_hint=, marshal_data=) at gtkmarshalers.c:86 + #28 0x00007ffff06e3c45 in g_closure_invoke (closure=closure@entry=0x6c7180, return_value=return_value@entry=0x7fffffffd4e0, n_param_values=2, param_values=param_values@entry=0x7fffffffd540, invocation_hint=invocation_hint@entry=0x7fffffffd4c0) at gclosure.c:768 + #29 0x00007ffff06f5cef in signal_emit_unlocked_R (node=node@entry=0x6c73f0, detail=detail@entry=0, instance=instance@entry=0x70ece0, emission_return=emission_return@entry=0x7fffffffd660, instance_and_params=instance_and_params@entry=0x7fffffffd540) at gsignal.c:3587 + #30 0x00007ffff06fdac2 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffd710) at gsignal.c:3315 + #32 0x00007ffff608790c in gtk_widget_event_internal (widget=widget@entry=0x70ece0 [GtkMenu], event=event@entry=0x944f90) at gtkwidget.c:5017 + #33 0x00007ffff6087be7 in IA__gtk_widget_event (widget=widget@entry=0x70ece0 [GtkMenu], event=event@entry=0x944f90) at gtkwidget.c:4814 + #34 0x00007ffff5f55b94 in IA__gtk_propagate_event (widget=0x70ece0 [GtkMenu], event=0x944f90) at gtkmain.c:2501 + #35 0x00007ffff5f55f5b in IA__gtk_main_do_event (event=0x944f90) at gtkmain.c:1696 + #36 0x00007ffff5bae7dc in gdk_event_dispatch (source=, callback=, user_data=) at gdkevents-x11.c:2425 + #37 0x00007ffff03e40ba in g_main_context_dispatch (context=0x693d50) at gmain.c:3122 + #38 0x00007ffff03e40ba in g_main_context_dispatch (context=context@entry=0x693d50) at gmain.c:3737 + #39 0x00007ffff03e4450 in g_main_context_iterate (context=0x693d50, block=block@entry=1, dispatch=dispatch@entry=1, self=) at gmain.c:3808 + #40 0x00007ffff03e4772 in g_main_loop_run (loop=0x748980) at gmain.c:4002 + +2015-04-02 Pavel Grunt + + session-spice: Remove spice-gtk version checks + Since 77ac0d8892837a117f9ca10020c1ac7f1944fca7 virt-viewer requires + spice-gtk v0.28 + + virt-viewer-app: Set hotkeys when app is constructed + virt_viewer_app_set_hotkeys() calls virt_viewer_app_set_enable_accel() + which notify the display about "enable-accel". However the display + begins to exist after the virt_viewer_app initialization. + + Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1206106 + + virt-viewer-window: Change zoom of the display only when it is possible + Do not allow to zoom out if it is not possible due to the width of + the top menu. It avoids emitting size allocation events that will + change the display resolution of the spice guest. + + Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1206460 + + virt-viewer-window: Return NULL instead of FALSE for display + + virt-viewer-display: Use MIN_DISPLAY_WIDTH/HEIGHT instead of numbers + + Use ZOOM constants instead of numbers + +2015-04-01 Christophe Fergeau + + Fix virt-viewer --reconnect crash with SPICE VMs + When using virt-viewer --reconnect, virt-viewer currently crashes when + a SPICE VM is destroyed with "virsh destroy" + + What happens is that when the guest is destroyed, virt-viewer receives a + SPICE_CHANNEL_ERROR_IO notification in + virt_viewer_session_spice_main_channel_event(). This triggers the + emission of the "session-disconnected" signal, which will end up calling + spice_session_disconnect() (indirectly through + virt_viewer_app_disconnected/virt_viewer_app_deactivate). + + Since spice-gtk commit ff25f3e, the actual session disconnection is + done from an idle. When the "session-disconnected" emission stops, the + VirtViewerSession instance is destroyed. However, the associated + VirtViewerDisplaySpice are still alive as the various SpiceChannels + instances hold a reference through the "virt-viewer-displays" GObject + data. + These channels are destroyed when the idle queued by spice_session_disconnect() + run. The associated VirtViewerDisplay are in turn destroyed too, but + this causes attempts to use the VirtViewerSession associated with the + displays, which has already been destroyed. This causes a crash. + + This commit adds a virt_viewer_session_spice_clear_displays() which is + similar to virt_viewer_session_clear_displays(), but makes sure the + "virt-viewer-displays" references are dropped too. This ensures the + VirtViewerDisplay instances don't outlive the VirtViewerSession + they are associated with. + + Backtrace for the crash: + + #0 0x0000000000413f0f in display_show_hint (display=0x85ab50 [VirtViewerDisplaySpice], pspec=0x939bd0 [GParamFlags], user_data=0x0) at virt-viewer-app.c:949 + #4 0x00000031ff22a29f in (instance=instance@entry=0x85ab50, signal_id=, detail=) at gsignal.c:3361 + #1 0x00000031ff20fc45 in g_closure_invoke (closure=0xa98f50, return_value=return_value@entry=0x0, n_param_values=2, param_values=param_values@entry=0x7fffffffc700, invocation_hint=invocation_hint@entry=0x7fffffffc680) at gclosure.c:768 + #2 0x00000031ff2214c9 in signal_emit_unlocked_R (node=node@entry=0x674f80, detail=detail@entry=1678, instance=instance@entry=0x85ab50, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffc700) at gsignal.c:3549 + #3 0x00000031ff229ed0 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffc8d0) at gsignal.c:3305 + #5 0x00000031ff214175 in g_object_dispatch_properties_changed (object=0x85ab50 [VirtViewerDisplaySpice], n_pspecs=, pspecs=) at gobject.c:1056 + #6 0x00000031ff216661 in g_object_notify (pspec=0x939bd0 [GParamFlags], object=0x85ab50 [VirtViewerDisplaySpice]) at gobject.c:1149 + #7 0x00000031ff216661 in g_object_notify (object=0x85ab50 [VirtViewerDisplaySpice], property_name=) at gobject.c:1197 + #8 0x000000000041e5ab in virt_viewer_display_set_show_hint (self=0x85ab50 [VirtViewerDisplaySpice], mask=1, enable=0) at virt-viewer-display.c:691 + #9 0x000000000042b62d in update_display_ready (self=0x85ab50 [VirtViewerDisplaySpice]) + at virt-viewer-display-spice.c:145 + #13 0x00000031ff22a29f in (instance=instance@entry=0x898590, signal_id=, detail=) at gsignal.c:3361 + #10 0x00000031ff20fc45 in g_closure_invoke (closure=0x99b280, return_value=return_value@entry=0x0, n_param_values=2, param_values=param_values@entry=0x7fffffffcc50, invocation_hint=invocation_hint@entry=0x7fffffffcbd0) at gclosure.c:768 + #11 0x00000031ff2214c9 in signal_emit_unlocked_R (node=node@entry=0x674f80, detail=detail@entry=1696, instance=instance@entry=0x898590, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffcc50) at gsignal.c:3549 + #12 0x00000031ff229ed0 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffce20) at gsignal.c:3305 + #14 0x00000031ff214175 in g_object_dispatch_properties_changed (object=0x898590 [SpiceDisplay], n_pspecs=, pspecs=) at gobject.c:1056 + #15 0x00000031ff216661 in g_object_notify (pspec=0xa83370 [GParamBoolean], object=0x898590 [SpiceDisplay]) at gobject.c:1149 + #16 0x00000031ff216661 in g_object_notify (object=0x898590 [SpiceDisplay], property_name=) at gobject.c:1197 + #17 0x00007ffff7522525 in update_ready (display=0x898590 [SpiceDisplay]) at spice-widget.c:236 + #18 0x00007ffff752257e in set_monitor_ready (self=0x898590 [SpiceDisplay], ready=0) + at spice-widget.c:244 + #19 0x00007ffff75274e6 in primary_destroy (channel=0x89f5c0 [SpiceDisplayChannel], data=0x898590) + at spice-widget.c:2169 + #20 0x00007ffff7528918 in channel_destroy (s=0x909fa0 [SpiceSession], channel=0x89f5c0 [SpiceDisplayChannel], data=0x898590) at spice-widget.c:2484 + #24 0x00000031ff22a29f in (instance=, signal_id=, detail=) at gsignal.c:3361 + #21 0x00000031ff20fc45 in g_closure_invoke (closure=0xa9bda0, return_value=return_value@entry=0x0, n_param_values=2, param_values=param_values@entry=0x7fffffffd280, invocation_hint=invocation_hint@entry=0x7fffffffd200) at gclosure.c:768 + #22 0x00000031ff2214c9 in signal_emit_unlocked_R (node=node@entry=0x9c17d0, detail=detail@entry=0, instance=instance@entry=0x909fa0, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffd280) at gsignal.c:3549 + #23 0x00000031ff229ed0 in g_signal_emit_valist (instance=, signal_id=, detail=, var_args=var_args@entry=0x7fffffffd450) at gsignal.c:3305 + #25 0x00007ffff71c3248 in spice_session_channel_destroy (session=0x909fa0 [SpiceSession], channel=0x89f5c0 [SpiceDisplayChannel]) at spice-session.c:2217 + #26 0x00007ffff71bd8b2 in session_disconnect (self=0x909fa0 [SpiceSession], keep_main=0) + at spice-session.c:281 + #27 0x00007ffff71c1b27 in session_disconnect_idle (self=0x909fa0 [SpiceSession]) at spice-session.c:1853 + #28 0x00000031fee4a0ba in g_main_context_dispatch (context=0x6a4400) at gmain.c:3122 + #29 0x00000031fee4a0ba in g_main_context_dispatch (context=context@entry=0x6a4400) at gmain.c:3737 + #30 0x00000031fee4a450 in g_main_context_iterate (context=0x6a4400, block=block@entry=1, dispatch=dispatch@entry=1, self=) at gmain.c:3808 + #31 0x00000031fee4a772 in g_main_loop_run (loop=0x9890f0) at gmain.c:4002 + #32 0x0000003babc05f75 in gtk_main () at gtkmain.c:1219 + #33 0x000000000043143b in main (argc=1, argv=0x7fffffffda48) at virt-viewer-main.c:12 + +2015-03-27 Fabiano Fidêncio + + virt-viewer: Make update_display() more readable + + virt-viewer: Do not wait for a guest that will never show up + All the situations where virt_viewer_update_display() can fail are + those when we won't be able to connect regardless of what changes on the + remote host. So, propagate the error instead of waiting for the guest to + start. + + Related: rhbz#1085216 + + remote-viewer: Avoid simple_message_dialog() when errors can be propagated + Remove the dialog used to report errors when create_session() fails, + propagating the error is enough and it is already done. + + Related: rhbz#1085216 + + virt-viewer: Avoid simple_message_dialog() when errors can be propagated + Remove all the dialogs used to report errors on extract_connect_info() + and just propagate the errors we got from it. + The only exception is virt_viewer_domain_event(), that is a callback + that doesn't have GError as argument. In this specific case, we show the + error dialog instead of propagating it. + + Related: rhbz#1085216 + + virt-viewer-app: create_session() should return a boolean + By convention functions that take GError parameters should return FALSE + (or NULL) or error. + + Related: rhbz#1085216 + + virt-viewer-app: Add a GError arg to create_session() + This is part of a small re-factoring that will have all connection + errors, when we won't be able to connect regardless of what changes on + the remote host, being treated by virt_viewer_app_initial_connect(), + avoiding weird behaviors as we have nowadays (like more than one error + dialog being shown or having the virt-viewer waiting forever for a guest + that will never show up). + + Related: rhbz#1085216 + + virt-viewer: Add a GError arg to update_display() + This is part of a small re-factoring that will have all connection + errors, when we won't be able to connect regardless of what changes on + the remote host, being treated by virt_viewer_app_initial_connect(), + avoiding weird behaviors as we have nowadays (like more than one error + dialog being shown or having the virt-viewer waiting forever for a guest + that will never show up). + + Related: rhbz#1085216 + + virt-viewer: Add a GError arg to extract_connect_info() + This is part of a small re-factoring that will have all connection + errors, when we won't be able to connect regardless of what changes on + the remote host, being treated by virt_viewer_app_initial_connect(), + avoiding weird behaviors as we have nowadays (like more than one error + dialog being shown or having the virt-viewer waiting forever for a guest + that will never show up). + + Related: rhbz#1085216 + +2015-03-26 Fabiano Fidêncio + + Do not use comments that are not in English + +2015-03-24 Pavel Grunt + + virt-viewer: Clean up if no vm was chosen + It is safe to clean up when running virt-viewer without specifying + vm name if no vm was chosen. It brings back behavior before 88f6341. + + The 'if (dom == NULL && err != NULL)' part was affected by commits + 824c4b9, 1eaaf8c, 15c7d17 so the check for 'err' is not needed anymore. + +2015-03-23 Pavel Grunt + + Report errors in one place + Since the error is propagated to the main, report the error there. + To make it work GError VIRT_VIEWER_ERROR_FAILED is set for all + failing states and it is reported using virt_viewer_app_simple_message_dialog(). + + Clear GError in cleanup section + + Exit normally when canceling dialog + This applies for: + libvirt authentication dialog (e.g. virt-viewer --attach guest) + 'recent connection' dialog (e.g. remote-viewer) + 'vm choose' dialog when connecting without specifying the vm name + + This is done by using a new GError VIRT_VIEWER_ERROR_CANCELLED. + + virt-viewer: Bring back debug log about nonexistent guest + Although commit 88f6341 allowed to use virt-viewer with a wrong guest name, + the user is informed about the nonexistent guest only by a dialog showing + the list of running machines or informing about the connection error. + + Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1201177 + +2015-03-23 Jonathon Jongsma + + Monitor config at sometimes leaves additional monitors enabled + When using the configuration file to specify which remote monitors should be + enabled when using the --full-screen option, it sometimes left additional + displays enabled, or didn't place the displays on the right monitor, or didn't + fullscreen them. + + This was especially true when not enabling the first display on the remote + host. For example: + + monitor-mapping=2:2;3:3 + + (note that configuration file uses 1-based indexes, rather than 0-based + indexes, so the numbers used below will be 1 less than those above) + + Previously, when performing fullscreen auto-conf, we were configuring displays + starting at #0 and ending at ndisplays. So for the previous configuration, we + looped from i = 0 to i < 2 (i.e. display #0 and #1) even though we should have + configured display #1 and #2. After this fix, we configure the exact displays + that were specified in the monitor-mapping configuration. + + Resolves: rhbz#1200750 + + Use 'constructed' vfunc instead of 'constructor' + We don't need the added complexity of 'constructor', since we only want + to do some final initializing after all of the properties have been set, + etc. So just use the simpler 'constructed'. + + VirtViewerApp: create main window after constructor + When using the configuration file to specify which remote monitors + should be enabled when using the --full-screen option, it sometimes left + additional displays enabled, or didn't place the displays on the right + monitor, or didn't fullscreen them. + + Part of the problem was that we were creating the first display window before + loading the monitor mapping configuration from the settings file. So even if + the first display was disabled in the configuration, the first window will + still be created with an id of 0, and therefore didn't get set to fullscreen. + Moving the main window creation to the 'constructor' vfunc instead of the + object init func ensures that the configuration is all loaded before we attempt + to do any fullscreen autoconf. + + Related: rhbz#1200750 + +2015-03-16 Fabiano Fidêncio + + Update geometry when enabling/disabling displays + _update_displays_geometry() must be called every time a display is + enabled/disabled, avoiding gaps (when a display is disabled) or overlaps + (when a display is enabled) between the monitors. + + This is what happens when we have 3 displays enabled (each one + represented by: width x height + x position + y position) ... + + Display #0 Display #1 Display #2 + +---------+ +----------+ +---------+ + | | | | | | + | | | | | | + | | | | | | + | | | | | | + | | | | | | + | | | | | | + +---------+ +----------+ +---------+ + (680x804+0+0) (504x804+680+0) (408x804+1184+0) + + Whether the Display #1 is disable, a message will be sent down to the + vdagent, representing the new arrangement of the monitors: + + Display #0 Display #2 + +---------+ +---------+ + | | | | + | | | | + | | | | + | | | | + | | | | + | | | | + +---------+ +---------+ + (680x804+0+0) (408x804+1184+0) + + However, taking a look on the x position, a gap can be identified as + Display #0 starts at position (0,0) and has 680 pixels of width. But + Display #1 only starts at position (1184, 0), leaving 504 pixels as a + gap. The proper message, however, should represent the following + arrangement ... + + Display #0 Display #2 + +---------+ +---------+ + | | | | + | | | | + | | | | + | | | | + | | | | + | | | | + +---------+ +---------+ + (680x804+0+0) (408x804+680+0) + + ... avoiding then gaps and overlaps. + + Resolves: rhbz#1111425 + https://bugzilla.redhat.com/show_bug.cgi?id=1111425 + +2015-03-13 Christophe Fergeau + + Deal with NULL gport in virt_viewer_app_set_connect_info() + virt_viewer_app_set_connect_info() has a debug statement printing + gport/gtlsport. It checks that gtlsport is not NULL before printing it, + but makes no similar check for gport. Since it's possible to get a NULL + gport when using ovirt:// after the previous commit, it's better to check + it too. + + ovirt: Don't try to use invalid port numbers + If a remote oVirt VM don't specify a port/secure port number, we'd still + try to pass it down to spice-gtk, which would then complain that 0 (the + default value) isn't a valid port number. + This commit make sure we filter out the default port/secure-port value + and pass NULL to spice-gtk instead when we get these values. + + foreign-menu: Don't show empty foreign menu on secondary displays + When using ovirt://, the foreign menu will only be shown in the primary + window after getting notified about OvirtForeignMenu::files (ie when + it managed to fetch some ISO files to show in the foreign menu). + + However, for secondary windows, the foreign menu will be added to the + window even if there are no files to show. This commit makes sure we + destroy the window foreign menu whenever it would be empty. + +2015-03-12 Fabiano Fidêncio + + POTFILES: Add virt-viewer-preferences.xml + The file was introduced in commit + 73b80ba99fb80140cadd07bbbf09a412bb9a0098 + + spec: Add virt-viewer-preferences.xml + The file was introduced in commit + 73b80ba99fb80140cadd07bbbf09a412bb9a0098 + +2015-03-12 Christophe Fergeau + + ovirt: Fail gracefully when hostname is missing + When parsing info returned by oVirt REST API, the hostname should be + present. However, I recently run remote-viewer against a buggy oVirt + instance where the hostname was missing. This commit handles better this + situation by displaying an error message and exiting. + + ovirt: Take into account SPICE proxy + VMs managed by oVirt can be hidden behind a proxy. This commit allows + remote-viewer to make use of this information when it's available + A recent oVirt instance is needed so that it's available through the + REST API, as well as libgovirt 0.3.3 or newer. + With older oVirt/libgovirt versions, the worst that can happen is a + runtime warning in the console, and an impossibility to connect to VMs + behind a proxy, so this commit is not raising the minimum libgovirt + requirement. + +2015-03-12 Fabiano Fidêncio + + Take --direct into consideration when checking if a guest is reachable + When connecting to a remote host (using qemu+ssh://...) that has a + virtual machine listening to "127.0.0.1", virt_viewer_is_reachable() must + take --direct into account, otherwise it can end up connecting to a local + virtual machine listening to "0.0.0.0" instead of returning that the + guest is not reachable. + + Resolves: rhbz#1085216 + +2015-03-11 Fabiano Fidêncio + + Add G_SOURCE_REMOVE to vir-glib-compat + G_SOURCE_REMOVE was introduced in GLib 2.32 and has its value defined as + FALSE. + + Avoid 'Dereference of a null pointer' + Caught by Covscan. + +2015-03-05 Marc-André Lureau + + Enable share folder widgets if supported by session + + Add virt_viewer_session_can_share_folder() + Functions name says it all, it is only implement for Spice, checking + for webdav channel presence. + + Sync preferences widgets with session properties + + Show preferences dialog + Add a menu item Preferences under File and show the preferences dialog + + Add preferences dialog UI file + + spice: enable/disable share folder + Connect/disconnect webdav channel to enable or disable sharing folder + +2015-03-04 Marc-André Lureau + + spice: sync share folder preferences with session + + Bump spice-gtk to 0.28 + The following patches will only work with spice-gtk >= 0.28. + + Add a few session properties for share folder + See properties comments for details. + + misc: add a missing "static" for function + +2015-02-23 Daniel P. Berrange + + Switch over to use zanata for managing translations + Push new pot with + + cd po + make virt-viewer.pot + zanata push + + Pull new translations with + + cd po + zanata pull + +2015-02-18 Pavel Grunt + + Do not add "https://" and "/api" to oVirt URI + It is deprecated since govirt 0.3.1 (and virt-viewer already depends on + govirt 0.3.2). + + Silences: + (remote-viewer:19420): libgovirt-WARNING **: Passing a full http:// or https:// URI to ovirt_proxy_new() is deprecated + (remote-viewer:19420): libgovirt-WARNING **: Passing an URI ending in /api to ovirt_proxy_new() is deprecated + +2015-01-12 Daniel P. Berrange + + Bump release to 3.0 for next dev cycle + + Update NEWS for 2.0 release + +2015-01-12 Marc-André Lureau + + wixl: use a versionized installation directory + It turned out that not only the current MSI broke the "component rule", + but also that our files are not versionized correctly. Windows Installer + applies some file versioning rules before replacing a file + http://msdn.microsoft.com/en-us/library/aa368599%28v=vs.85%29.aspx + + Since msitools doesn't extract version from files and populate the Version + field of the File table, it "usually" keep the current file installed. + + It's practically impossible to rely on version information from + files (from a quick look, only 5% of the files are versionized and even + less correctly, libgcrypt seems to do non-monotonic buildid for example) + + So the rule that applies when files are not versionized is to check the + file hash, and the modified date. File hash was added recently in + msitools, but doesn't apply when the installed file itself has a + version. + + In order to solve the above problems, it's simpler to just have a + different installation prefix. Windows Installer will see files with + different component guid, and won't be checking any file update rule. I + have verified the upgrade is working, not leaving any file behind and + updating registry correctly with this solution. Until the files are + correctly versionized, it looks like the only sensible thing to + do. Furthermore, this make it simpler to have several versions installed + in parallel later on (when we change productid) + +2015-01-12 Daniel P. Berrange + + Update LINGUAS file from translation refresh + + Tweak autobuild.sh to facilitate release builds + + Refresh translations from transifex + +2015-01-09 Daniel P. Berrange + + Add deps on mingw glib-networking RPMs needed by libsoup + + Update mingw RPM deps to refer to gstreamer1 + +2015-01-08 Daniel P. Berrange + + Fix typo s/SPICE_GTK3_REQUIRED/SPICE_GTK_REQUIRED/ + There is no separate version constant for SPICE GTK2 vs GTK3 + +2015-01-08 Fabiano Fidêncio + + virt-viewer: set transient parent for connection's error dialog + Commit c3d24f8b sets transient parent for the most part of the + GtkDialogs, but seems like this one was forgotten. + +2015-01-06 Christophe Fergeau + + virt-viewer: Don't connect to localhost displays with qemu+tcp:// + When connecting to a remote libvirt instance, a VM may only be listening + on localhost for SPICE/VNC connections. In such a situation, virt-viewer + then tries to connect to localhost, which is not correct as this + 'localhost' referred to the remote libvirt host it connected to. + This commit adds a couple of tests on the libvirt URI used and the + listen address to error out in this situation. + + Resolves: rhbz#1108523 + +2015-01-06 Jonathon Jongsma + + Remove 'map' handler for VirtViewerDisplay + In order to solve several problems with sizing and resizing displays, a + 'map' handler was added to VirtViewerDisplay. The first time the map + handler runs, its queues a resize to attempt to ensure that the window + gets created at its desired size. Subsequent map events generate a call + to _make_resizable(), which was an attempt to ensure that the window was + always 'shrinkable' on the Microsoft Windows platform. Recent testing + suggests that this _make_resizable() is not actually necessary on + Windows anymore, since it is possible to shrink the display even when + this call is removed. + + In addition, the call to _queue_resize() is a bit of an indirect + solution to the problem of ensuring the proper size at startup. What we + really want is to guarantee that the very first size request negotiation + returns the desired size rather than the minimum size. In order to do + this, we've added a flag to determine whether we've ever received a size + request, and if not, we return our desired size, even if 'dirty' is not + set. + +2015-01-05 Fabiano Fidêncio + + spec: Update mingw in order to use gstreamer1 + +2015-01-05 Victor Toso + + nsis: use gstreamer-1.0 instead of gstreamer-0.10 + Spice-gtk now is able to use gstreamer-1.0 for playback and record + audio. This patch updates the installer to use the latest version. + +2015-01-02 Christophe Fergeau + + win: Use correct format string for intptr_t + Using %d as a format-specifier for intptr_t causes a warning with + mingw64: + virt-viewer-events.c: In function 'virt_viewer_events_add_handle': + virt-viewer-events.c:103:5: warning: format '%d' expects argument of + type 'int', but argument 5 has type 'intptr_t' [-Wformat=] + g_debug("Converted fd %d to handle %d", fd, _get_osfhandle(fd)); + +2014-12-22 Fabiano Fidêncio + + spec: Update mingw in order to use ovirt + + spec: Update mingw in order to use gtk3 + + nsis: use gtk-vnc conditionally + Only include gtk-vnc as dep when it's explicitly done in the configure. + + nsis: use spice-gtk conditionally + Only include spice-gtk as dep when it's explicitly done in the configure. + + nsis: use libgovirt conditionally + Only include libgovirt as dep when it's explicitly done in the configure. + + nsis: add missing file needed to use virsh.exe + + nsis: use libvirt conditionally + Only include libvirt as dep when it's explicitly done in the configure. + +2014-12-21 Fabiano Fidêncio + + msi: use gtk-vnc conditionally + Only include gtk-vnc as dep when it's explicitly done in the configure. + + msi: use spice-gtk conditionally + Only include spice-gtk as dep when it's explicitly done in the configure. + + msi: use libgovirt conditionally + Only include libgovirt as dep when it's explicitly done in the configure. + + msi: use libvirt conditionally + Only include libvirt as dep when it's explicitly done in the configure. + + cosmetic: use $(VAR) instead of ${VAR} + +2014-12-19 Pavel Grunt + + Set a transient parent for GtkDialogs + Silence the Gtk 3.14 message: + "GtkDialog mapped without a transient parent. This is discouraged." + +2014-12-15 Marc-André Lureau + + msi/nsis: fix keyboard-shortcuts icon location + The /usr/share/icons/gnome icon theme location has been replaced with + Adwaita in f21, fix the path. + +2014-12-15 Fabiano Fidêncio + + msi: add gtk3 support + Add support to build the virt-viewer's msi using GTK3. + For the GTK3 build, in order to provide all used icons for Windows + systems we have to include manually all the icons we want to or add + adwaita-icon-theme as dependency. I've decided to go with the first + approach, what can be improved when we have "foreach" support in + msitools (https://bugzilla.gnome.org/show_bug.cgi?id=741296). + + msi: add libgovirt as dependency + libgovirt is used to provide support to foreign menu using ovirt. + + nsis: add missing 24x24 icons + + nsis: add gtk3 support + Add support to build the virt-viewer's nsis using GTK3. + + nsis: remove $INSTDIR\etc + + nsis: remove $INSTDIR\etc\libvirt + + nsis: remove dup entries + + nsis: add libgovirt (and its dependencies) + libgovirt is used to provide support to foreign menu using ovirt. + + nsis: add libwinpthread-1.dll + libwinpthread-1.dll is a dependency of libvirt + + nsis: add libopus-0.dll + libopus-0.dll is a dependency of spice-glib + + nsis: add libnettle-4-7.dll (and its dependencies) + libgcc_s_sjlj-1 is needed by libgmp (on x86) + libgcc_s_seh-1 is needed by libgmp (on x86_64s) + libgmp-10.dll is needed by libnettle + libhogweed-2-5.dll is provided by libnettle + libnettle-4-7.dll is needed by gnutls + gnutls is needed by gvnc and libvirt + + An interesting point here that worth to mention is the usage of /nonfatal + when including libgcc_s_{sjlj,seh}-1.dll. As we only have the _seh in x64 + the build breaks trying to add "not found" files. A check for arch was + one option to solve the problem, but _sjlj may exist in x64 as well, when + using an old gcc. An explicit check if the file exists (in compile time) + was another idea, but for some reason the "-" part of the filename was + interpreted as a math operand, breaking the build. + With all that in mind, adding /nonfatal was the most convenient solution. + + nsis: update libgnutls version + Use version -28 instead of -26, matching what currently is in f21. + + nsis: update libtasn1 version + Use version -6 instead of -3, matching what currently is in f21. + + nsis: update libpng version + Use libpng15-15 instead of libpng16-16, matching what currently is in + f21. + + nsis: update libgcrypt version + Use version -20 instead of -11, matching what currently is in f21. + +2014-12-10 Pavel Grunt + + display-vnc: fix zoom-level set by command line + Setting the zoom-level using the command line option '--zoom' is not + working for vnc guests. This problem can be solved by emitting + the "display-desktop-resize" signal when vnc is initialized. + + https://bugzilla.redhat.com/show_bug.cgi?id=1170071 + +2014-12-01 Marc-André Lureau + + Do not show twice error dialog when no VM are found + When running virt-viewer without argument, and no VM are found, you get + two error dialogs. Only one is enough. + + spice: calling VirtViewerSession:close() can destroy self + SpiceSession in spice-gtk v0.27 will remove channels from session during + disconnect (and not when they are actually disposed). When no channels + are left, session-disconnected is emitted, and the VirtViewerSession + will be unref from the application. Use a weak reference to self to + avoid crashing after calling spice_session_disconnect() + + As a workaround for existing clients, spice-gtk v0.27 will defer the + disconnection to idle time. But the fix still makes sense and would + prevent potentially future issues if spice-gtk changes back to sync + disconnection. + + (the alternative of calling ref/unref would needlessly recreate a + SpiceSession with a call to create_spice_session(), which is something + we can avoid when leaving the application) + +2014-11-25 Marc-André Lureau + + virt-viewer: allow connection to unix socket only server + Even when the server doesn't provide a display connection address, + virt-viewer is able to connect to guest with libvirt attach. + + Report error on attach-only display + Provide error details if the display can only be access through libvirt + --attach method. + + Report error in dialog + Use a UI dialog to inform of connection error. + + Simplify virt_viewer_initial_connect() + - do not overwrite err if ->initial_connect() sets it + - remove need for waitvm if the display server isn't yet started (note: + this function might be untested, I am not sure relying on libvirt events + is enough) + + Simplify virt_viewer_initial_connect() + - remove need for waitvm if the display server isn't yet started (note: + this function might be untested, I am not sure relying on libvirt events + is enough) + + Simplify virt_viewer_initial_connect() + Some refactoring to make the code easier to read, mostly code + movement/reindenting and introduction of a "wait" label which has the + same purpose as "done". + This also adds a "goto wait" within an if block, but this does not + change the initial code flow, just makes it more explicit. + + Remove VIRT_VIEWER_VM_CHOOSE_DIALOG_CANCELLED + This error type isn't really an error, it is used to skip error report + code. The functions can simply return FALSE on failure, without GError + set, to indicate that program should quit normally. + + Limit HAVE_SOCKETPAIR to directly concerned code + + Move libvirt reconnect polling to VirtViewer + This is libvirt specific, no need to share it in the VirtViewerApp base + class. + + spice: use virt_viewer_signal_connect_object + This isn't required, but makes it easier to track reference issues, as + you have guarantee that callbacks won't be executed if the objects are + disposed. + +2014-11-24 Fabiano Fidêncio + + Add virt-viewer-usb.png + Windows XP (at least) doesn't recognize .svg files + +2014-11-20 Fabiano Fidêncio + + Replace priv->withEvents usage for priv->domain_event + Once we have priv->domain_event, we don't need priv->withEvents anymore + + Prefer to use virConnectDomainEventRegisterAny() + The usage of virConnectDomainEventRegister() is no longer recommended + according to the libvirt's documentation. + + Set freed priv->dom to NULL in _dispose() + Avoid a possible use/free after the object has been freed. + + Make sure conn exists before use it + Although all the used functions have a explicit check for a valid + virConnPtr, let's be safe and only use priv->conn when its value is + non-NULL. + +2014-11-18 Christophe Fergeau + + VirtViewerApp: Never remove main window + It's currently possible to destroy any virt-viewer window, including the + main window. However, some part of the code expects that the main window + is always present, for example to present status messages. + + In particular, stopping the guest (or running virsh destroy) will close + all windows: virt_viewer_session_clear_displays will get called, which + will call into virt_viewer_app_remove_display_removed, and finally into + virt_viewer_app_remove_nth_window, which will destroy the window being + removed if it holds the last reference to it. + + So going through virt_viewer_session_clear_displays, all + VirtViewerWindow instances and their corresponding GtkWindow have been + destroyed. This is already an issue as VirtViewerApp::main_window will + be pointing to freed memory. + + When using virt-viewer --reconnect, this will cause a crash when + restarting the guest in virt_viewer_app_create_session as it tries to + get a valid GtkWindow through: + GtkWindow *window = virt_viewer_window_get_window(priv->main_window); + + This commit avoids this issue by special casing the main window in + virt_viewer_app_remove_nth_window to ensure it never gets removed. + This is similar to what is done in virt_viewer_app_hide_all_windows. + +2014-11-14 Christophe Fergeau + + Fix check of virt_viewer_app_initial_connect return value + Commit 13f493200 changed virt_viewer_app_initial_connect to return a + gboolean rather than an int, but one call site was not updated to the + new convention, and was still checking for a negative value rather than + for FALSE in order to detect failures. + +2014-11-03 Daniel P. Berrange + + Check for spice-gtk 0.26 instead of a git snapshot of 0.25 + As spice-gtk macro for checking the version numbers was broken, let's + check for 0.26 and avoid to have virt-viewer broken on a few distros + for a good long time. + +2014-10-31 Christophe Fergeau + + Don't use virGetLastErrorMessage() + This was introduced in libvirt 1.0.6 but we only require libvirt 0.10.0 + + Don't call local variable 'select' + This causes warnings with older compilers + virt-viewer-vm-connection.c:52: warning: declaration of 'select' shadows + a global declaration + /usr/include/sys/select.h:109: warning: shadowed declaration is here + +2014-10-27 Daniel P. Berrange + + Avoid log message warning messages due to incorrect int format + The G_N_ELEMENTS() type is size_t but this was being passed to + a format string with '%lu' which is of a different size on many + platforms. Just delete this part of the warning message since + it was not hugely useful. + + Add new ui files to the RPMs + + Avoid use of non-literal string with g_debug + + Fix typo s/to to/to/ + + Remove useless 'if (...)' before free() + The 'free()' function accepts NULL, so you should not + check for NULL before calling it. + +2014-10-27 Jonathon Jongsma + + Don't try to re-configure displays when there are none + virt_viewer_session_on_monitor_geometry_changed() gets called + immediately upon agent connection, but sometimes this is before any + displays have been received. Simply return early when this is the case. + + Shift top-left display to origin + When using a custom fullscreen display configuration, it's possible to + specify that e.g. a single screen should be fullscreen on client + monitor #4. Since we send down absolute positions and disable alignment + when all windows are in fullscreen, we can send configurations with a + very large offset to the top-left corner. This could result in the guest + trying to create a screen that was much larger than necessary. For + example when sending a configuration of 1280x1024+4240+0, the guest + would need to allocate a screen of size 5520x1024, which might fail if + video memory was too low. To avoid this issue, we shift all displays + so that the minimum X coordinate for all screens is at x=0, and the + minimum y coordinate is at y=0. + +2014-10-24 Jonathon Jongsma + + Move monitor alignment function to util header + +2014-10-23 Christophe Fergeau + + man: Improve documentation for 'version' field in vv files + +2014-10-23 Rex Dieter + + spec: Update/optimize mime scriptlets + +2014-10-16 Fabiano Fidêncio + + Check for the right spice version in session-spice.c + We have to check for the spice version where the + SPICE_CLIENT_ERROR_AUTH_NEEDS_PASSWORD_AND_USERNAME was introduced and + not for the one where spice_channel_get_error() was introduced. + +2014-10-16 Jonathon Jongsma + + Don't disable "send key" menu when display isn't ready + The ability to send a keystroke should not depend on whether a display + is ready or not, it only depends on whether the display exists or not. + + See https://bugzilla.redhat.com/show_bug.cgi?id=1152574 + +2014-10-15 Jonathon Jongsma + + Fix bug with initial placement of fullscreen windows + The function app_window_try_fullscreen() will lookup the initial monitor + for the nth monitor internally, so we should pass in the display ID to the function + rather than the mapped monitor ID. This was causing 2 monitors on the + same monitor with a configuration like this: + + monitor-mapping=1:2;2:1 + +2014-10-15 Fabiano Fidêncio + + Force display_show_hint() when the display is set + Since a window is not created at startup for each display, the first + display(s) set when the application is opened will never receive and + treat the "notify::show-hint" signal on VirtViewerWindow, once the + callback is only set when the display is set to the specific window. + It causes problems like the "Send Key" menu not activated till an extra + display is added. To avoid this problem, let's force a call to + display_show_hint() everytime a display is set. + + Resolves: rhbz#1152468 + https://bugzilla.redhat.com/show_bug.cgi?id=1152468 + +2014-10-10 Marc-André Lureau + + Use socat instead of nc if possible + It turns out that nc does not leave on server disconnect, and there + doesn't seem to be any option to do that, leaving client open, and + a bunch of idle processes. + + Replacing nc with socat solves that, client is disconnected when + the VM is shut down, when the sever connection is closed. + + https://bugzilla.redhat.com/show_bug.cgi?id=1030487 + +2014-10-10 Fabiano Fidêncio + + Prefill the username in the authentication dialog + Lets prefill the username entry using the user name of the + current user. + + Use 'username' property from .vv file for spice-session + + Ask for username when connecting with SASL + When connecting with SASL for authentication, some authentication + mechanisms need a username (the plain text and md5 ones, for example). + +2014-10-10 Pavel Grunt + + Show VM chooser dialog when starting virt-viewer with no arg + When user starts virt-viewer without specifying VM domain name + or with a wrong name a list of running machines is shown + and user may choose one of them. + + Show VM chooser dialog when oVirt VM name is missing + When a user tries to connect to ovirt without specifying + VM name (remote-viewer ovirt://ovirt.example.com) or with + wrong VM name a list of available virtual machines is shown, + and the user may pick a machine he wants to connect to. + +2014-10-09 Christophe Fergeau + + man: Document [ovirt] section in .vv files + Add documentation for these options even though they are mainly meant to + be set by the oVirt portal when it generates the .vv file. + + man: Improve doc for 'ca' in .vv files + Make it clearer that this CA will be used to validate the certificate + presented by the remote SPICE host when using TLS. + + Fix 'seperate' typo in man page/comments + + ovirt: Allow to remove CD images + It turns out this is supposed to be done through update requests with a + CD image with an empty name, which is what the current code tries to do. + The only reason it's not working is because of server-side bugs with + oVirt < 3.5 + The requirement on libgovirt is raised to 0.3.2 as + a small change is needed as well in libgovirt to allow empty filenames: + https://git.gnome.org/browse/libgovirt/commit/?id=bdb788fcc + + Without this change, nothing too bad will happen, but the CD won't be + removed and warnings will be logged in the console. + +2014-10-01 Ján Tomko + + Prefer virDomainOpenGraphicsFD for --attach + The virDomainOpenGraphics API cannot label the socket + we pass to it. Prefer virDomainOpenGraphicsFD (if building + with libvirt 1.2.8 or later) which creates the socket for us + and works with SELinux too. + + Fall back to the old API if the new one is unsupported + (i.e. the libvirtd on the host is older than the libvirt version + virt-viewer was compiled against). + + Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1141228 + +2014-09-26 Fabiano Fidêncio + + Let the user cancel the SPICE auth dialog + virt_viewer_auth_collect_credentials() was recently changed to return + a boolean instead of an integer (2561c171). This change introduced a + regression in the authentication dialog behavior, making it impossible + for the user to cancel. + + Improve authentication error messages + Adding a better error message to our default error message, based on the + libvirt error. Also, the libvirt error is shown as debug. + + https://bugzilla.redhat.com/show_bug.cgi?id=1142742 + + Simplify virt_viewer_auth_libvirt_credentials() return value logic + As the function should return < 0 in error cases, let's explicitly + return/set the return value to -1 in error cases. Otherwise, the + function will return 0. + + This patch also fixes a regression introduced by (a5ce2ed3). + + https://bugzilla.redhat.com/show_bug.cgi?id=1142742 + +2014-09-26 Jonathon Jongsma + + Add example of an oVirt URI to the manpage + https://bugzilla.redhat.com/show_bug.cgi?id=1142769 + + Add documentation for fullscreen monitor mapping + see https://bugzilla.redhat.com/show_bug.cgi?id=1142769 + + Initialize fullscreen display map to fallback + If uuid was never set, we never checked the 'fallback' monitor map. + Initializing the monitor map to the fallback value at startup solves + this issue. This allows fallback mode to work with older servers that + don't send the UUID. + + Unset app 'fullscreen' when leaving fullscreen + Previously, the fullscreen floating toolbar and the "toggle-fullscreen" + hotkey (which maps to the menu item action) had slightly different + methods of exiting fullscreen. The floating toolbar method unset the + 'fullscreen' property on the application (which causes all windows to + simultaneously exit fullscreen), whereas the hotkey did not. This had a + side-effect of preventing the display from auto re-sizing if it was + fullscreened again. After this change, both the hotkey and the toolbar + button will unset the application-level 'fullscreen' property when + exiting fullscreen mode. + + Resolves: rhbz#1022608 + +2014-09-24 Jonathon Jongsma + + VirtViewerDisplayVnc: set 'session' property + Set the display's session property in the constructor. If the session is + not set, then virt_viewer_display_get_session() doesn't return anything + useful. + + Make default window size a bit more useful + Currently, windows have a default size of 400x400 pixels. This is a + strange aspect ratio for a display, and it is also too small to be + useful for much. Since the default window size determines the initial + size of newly-enabled displays, it would be nice if we used a slightly + better size. + + Set initial window size to display desktop size + When setting the 'display' for a VirtViewerWindow, the initial size for + that window should be the size of the remote display. So we synthesize a + desktop resize event when setting a new display for a window. This is + only done for enabled displays. Disabled displays generally have a size + of 0x0, which would result in the window being at it's minimum size, so + just allow the window to use its default size. + + Create windows on demand, not at startup + Previously, a window was created at startup for each display, even if + the display was not enabled. This resulted in a fixed 1:1 association + between windows and remote displays. Since there was always one window + created at startup to display status messages (the "main window"), this + was always associated with remote display #1. But if the first remote + display was not enabled, we ended up with a extra black window with a + message saying ("Waiting for display 1..."). + + By creating windows on demand, we can re-use the "main window" for any + arbitrary display, even if it's not display #1. + + Resolves: rhbz#1032939 + + VirtViewerApp: store windows in a list + Use a list to store the application's windows. This is another step + towards separating the window from the guest display ID. + + VirtViewerDisplay: add convenience API for getting nth + g_object_get(...) can be cumbersome, so add convenience API for getting + the display ID ("nth-display") property: + + virt_viewer_display_get_nth() + + App: keep hash table of displays + This is part of a re-factoring that will de-couple the client window + from the remote display id. + + Don't show extra screens in fullscreen mode + When using the fullscreen display mapping configuration file, extra + monitors could end up enabled by mistake. This was because + virt_viewer_app_get_initial_monitor_for_display would end up returning + Nmonitor = Ndisplay when the display map hash lookup failed. In + reality, when a display map is specified, but the hash lookup fails, + the display should not be enabled. This function now returns -1 to + distinguish this case, and the display is not enabled when this value is + returned. + + Resolves issue described at + https://bugzilla.redhat.com/show_bug.cgi?id=1129477#c9 + + Move monitor mapping into app_window_try_fullscreen() + Rather than requiring all callers to calculate the initial monitor + mapping before calling app_window_try_fullscreen, move the + responsibility for calculating the correct monitor into this function. + This makes it less likely that somebody will forget and a display will + get placed on the wrong monitor. + +2014-09-23 Christophe Fergeau + + Don't unref 'display' in VirtViewerDisplaySpice::finalize + Right after being created, the SpiceDisplay 'display' private member is + added to the VirtViewerDisplaySpice GTK+ container with + gtk_container_add. This call will take ownership of the floating + reference that SpiceDisplay got upon creation. + This means VirtViewerDisplaySpice::display is a pointer to SpiceDisplay, + but it must not be unref'ed when the object is destroyed as we don't own + that reference. + As the container which owns the reference is the + VirtViewerDisplaySpice instance itself, we don't need to take an + additional reference here. + + This fixes a crash when exiting remote-viewer after connecting to a + SPICE VM: + #0 0x00007ffff3f33a81 in g_type_check_instance_is_fundamentally_a (type_instance=0x874500, fundamental_type=80) at gtype.c:3981 + #1 0x00007ffff3f19f96 in g_object_unref (_object=0x874500) at gobject.c:3067 + #2 0x000000000042a1ea in virt_viewer_display_spice_finalize (obj=0x6ebc30) at virt-viewer-display-spice.c:65 + #3 0x00007ffff3f1a257 in g_object_unref (_object=0x6ebc30) at gobject.c:3170 + #4 0x0000000000428de7 in destroy_display (data=0x6ebc30) at virt-viewer-session-spice.c:649 + #5 0x00007ffff3bbb51b in g_ptr_array_foreach (array=0x7e12a0, func=0x428d71 , user_data=0x0) at garray.c:1502 + #6 0x00007ffff3bbaadf in ptr_array_free (array=0x7e12a0, flags=FREE_SEGMENT) at garray.c:1088 + #7 0x00007ffff3bbaa10 in g_ptr_array_unref (array=0x7e12a0) at garray.c:1036 + #8 0x00007ffff3bcf9bd in g_data_set_internal (datalist=0xa0adb0, key_id=1622, new_data=0x0, new_destroy_func=0x0, dataset=0x0) at gdataset.c:407 + #9 0x00007ffff3bcfe74 in g_datalist_id_set_data_full (datalist=0xa0adb0, key_id=1622, data=0x0, destroy_func=0x0) at gdataset.c:670 + #10 0x00007ffff3f1a771 in g_object_set_data (object=0xa0ada0, key=0x437252 "virt-viewer-displays", data=0x0) at gobject.c:3461 + #11 0x0000000000429b56 in virt_viewer_session_spice_channel_destroy (s=0x6eb910, channel=0xa0ada0, session=0x8cb3a0) at virt-viewer-session-spice.c:854 + #12 0x00007ffff3f12d81 in g_cclosure_marshal_VOID__OBJECT (closure=0x8e8fd0, return_value=0x0, n_param_values=2, param_values=0x7fffffffcd80, invocation_hint=0x7fffffffccc0, marshal_data=0x0) at gmarshal.c:1272 + #13 0x00007ffff3f0e143 in g_closure_invoke (closure=0x8e8fd0, return_value=0x0, n_param_values=2, param_values=0x7fffffffcd80, invocation_hint=0x7fffffffccc0) at gclosure.c:768 + #14 0x00007ffff3f2aef0 in signal_emit_unlocked_R (node=0x7c1f20, detail=0, instance=0x6eb910, emission_return=0x0, instance_and_params=0x7fffffffcd80) at gsignal.c:3553 + #15 0x00007ffff3f2a1f3 in g_signal_emit_valist (instance=0x6eb910, signal_id=219, detail=0, var_args=0x7fffffffd058) at gsignal.c:3309 + #16 0x00007ffff3f2a746 in g_signal_emit (instance=0x6eb910, signal_id=219, detail=0) at gsignal.c:3365 + #17 0x00007ffff529d784 in spice_session_channel_destroy (session=0x6eb910, channel=0xa0ada0) at spice-session.c:1990 + #18 0x00007ffff529ed25 in spice_channel_dispose (gobject=0xa0ada0) at spice-channel.c:153 + #19 0x00007ffff52acd26 in spice_display_channel_dispose (object=0xa0ada0) at channel-display.c:136 + #20 0x00007ffff3f1a132 in g_object_unref (_object=0xa0ada0) at gobject.c:3133 + #21 0x00007ffff52a4afb in spice_channel_delayed_unref (data=0xa0ada0) at spice-channel.c:2156 + #22 0x00007ffff3bf21d1 in g_idle_dispatch (source=0xa35a00, callback=0x7ffff52a49f3 , user_data=0xa0ada0) at gmain.c:5320 + #23 0x00007ffff3bef8eb in g_main_dispatch (context=0x68a920) at gmain.c:3064 + #24 0x00007ffff3bf0661 in g_main_context_dispatch (context=0x68a920) at gmain.c:3663 + #25 0x00007ffff3bf0853 in g_main_context_iterate (context=0x68a920, block=1, dispatch=1, self=0x6c8c60) at gmain.c:3734 + #26 0x00007ffff3bf0c7c in g_main_loop_run (loop=0x889b20) at gmain.c:3928 + #27 0x00007ffff69be44f in gtk_main () at gtkmain.c:1207 + #28 0x0000000000431896 in main (argc=1, argv=0x7fffffffd648) at remote-viewer-main.c:183 + +2014-09-23 Fabiano Fidêncio + + Do not fail when the auth dialog is cancelled + https://bugzilla.redhat.com/show_bug.cgi?id=1145460 + + Revert changes related to numpad accelerators + Due to a GTK+ limitation and bad testing from my side, I've pushed + two patches trying to add support to use Ctrl + {+, -, 0} from numpad + to control zoom-in, zoom-out and zoom-reset. + Unfortunately, with the first patch (3a168815) I've duplicated the menu + items related to the zoom functions. With the second one (55cdb986), + provided to not show the duplicated menu items, we came back to the + initial state, where the numpad accelerators don't work. + + So, in resume, multiple accelerators in a GTK+ widget are only supported + on applications using GApplication, what is not our case and won't be + till we drop the GTK+2 support. + + Revert "Do not show duplicated menu items" and + Revert "Add support to use numpad accelarators for zoom-{in.out,reset}" + + This reverts commits 55cdb9867df05f1c4f6c8e569a6f0c1e0bc28d99 and + 3a168815b738076526ba0f3e9a82e6fb1db482e9. + +2014-09-22 Christophe Fergeau + + Remove inaccurate G_GNUC_UNUSED + The 'user_data' variable is used in the callback. + +2014-09-17 Fabiano Fidêncio + + Add support to view the password entry content + Allow users to check if the entered password is right and/org modify + the password easily in case it's wrong. + +2014-09-15 Fabiano Fidêncio + + Mark all strings for translation in the auth dialog + A few strings weren't marked for translation in the authentication + dialog. + + Do not show duplicated menu items + When the support to use numpad accelerators for zoom-{in,out,reset} + was added (3a168815), by mistake, we have added duplicated buttons + in View -> Zoom. + +2014-09-12 Christophe Fergeau + + Fix --without-spice-gtk --with-ovirt build + The oVirt foreign menu support reused some existing bits from the older + SPICE controller foreign menu code. However, this controller code is + only built when spice-gtk support is built, while the oVirt foreign menu + code could be used with VNC as well. Trying to build the ovirt foreign + menu code without spice-gtk causes build issues due to missing + functions, or missing declarations, ... + + The libgovirt/spice-gtk code which is entangled is the code to update + the foreign menu when its content changes, or when a new window is + opened. Making the oVirt-specific code independant from the + spice-gtk-specific code is not too complicated, but this comes at the + expense of a bit of code duplication, but this is only simple code + iterating over the GHashTable storing the opened windows. + + Resolves: rhbz#1127156 + + Add translatable file to POTFILES.in + +2014-09-11 Jonathon Jongsma + + Remove extra ref on SpiceDisplay + There's no need to ref the SpiceDisplay widget when adding it to a + container. The container will take its own ref. + + VirtViewer: Fix memory leaks + Don't leak priv->uri or priv->domkey from VirtViewer class + +2014-09-05 Jonathon Jongsma + + Don't print warning for missing comment in config file + Change g_warning to g_debug as suggested by Marc-Andre + +2014-08-26 Jonathon Jongsma + + Change collect_credentials() to return a boolean + Instead of returning 0 for success and -1 for failure, change to a + boolean success value to be more consistent with the rest of the + virt-viewer code. + + Auth: fix leak of username + When collect_credentials() returns a failure status, 'username' was + potentially leaked. + +2014-08-19 Jonathon Jongsma + + remote-viewer: oVirt username review fixes + Minor fixes from patch review + + rhbz#1061826 + +2014-08-19 Fabiano Fidêncio + + Force displays to update geometry when agent connects + We have to force displays to update geometry when the agent connects to + ensure the client will have the guest with the right resolution when the + guest has rebooted or the agent has crashed. + + https://bugzilla.redhat.com/sho_bug.cgi?id=1021841 + + Fix gcc warning (unused-parameter) + + Fix gcc warning (missing-prototypes) + + Add support to use numpad accelarators for zoom-{in.out,reset} + As virt-viewer uses GtkAccelMap for shortcuts and that GTK only can have + one key binding per accelerator (in accel_map_add_entry), let's also add + support specificly for the numpad keys in the virt-viewer code + + https://bugzilla.redhat.com/show_bug.cgi?id=883433 + + Don't check for NULL when it never can happen + +2014-08-18 Christophe Fergeau + + Create foreign menu from .vv file information + When the .vv file has an [ovirt] section, we should try to create a foreign + menu out of it. This will allow remote-viewer to offer a menu to change the + currenty inserted cdrom. + + Contrary to the ovirt:// case when we already have fetched an OvirtAPI + and OvirtVm instance in order to get the SPICE/VNC connection details, + when working from a .vv file, we'll need to get them from the REST API. + Authentication should happen through the JSESSIONID cookie, if that + fails we want to give up on using the foreign menu, so we don't need to + set up authentication callbacks. + + Add ovirt-specific properties to VirtViewerFile + They will be useful to implement foreign menu support through + oVirt REST API + + Add 'group' argument to VirtViewerFile helpers + For foreign menu support, we'll need a way to pass oVirt-specific + information in the .vv file. This will be done through an additional + [ovirt] section, this commit is in preparation for that. + + ovirt: Use OvirtForeignMenu class + After the previous commit which introduced the OvirtForeignMenu + class, we can now make use of it in the remote-viewer UI code. + + ovirt: Add OvirtForeignMenu class + This class is used to implement the so-called oVirt 'foreign menu' + which is a menu populated with ISO images available on the + oVirt instance that the user can dynamically insert into the + virtual machine he is currently viewing. + + ovirt: Remove extra '/' from oVirt URI + The 'path' part of the URI will always start with a '/' when present as + this is what separates it from the hostname. When rebuilding the final + URI, the current code inserts a '/' by itself between the hostname and + the path, which results in URIs with an extra '/': + https://ovirt.example.com//some/path/api + + This is not only cosmetic as this can cause issues with cookie handling + if libgovirt accesses //some/path/api while the cookie is set for + /some/path/api. + +2014-08-18 Jonathon Jongsma + + remote-viewer: allow username in ovirt URIs + When the user launches remote-viewer with an ovirt URI of the form + + ovirt://user@host/vmname + + Pre-populate the authentication dialog with the specified username. We + don't support specifying the password on the commandline, since that is + a potential security risk. + + rhbz#1061826 + +2014-08-15 Jonathon Jongsma + + Don't use fallback ca-file when launching vv-file + When launching from a vv-file, we want to use the ca specified in the vv + file and not load additional certs from the fallback ca-file. This + ensures that the ca-file property of the spice session is unset when + loading a ca from a vv-file. + + Resolves: rhbz#1127762 + +2014-08-07 Jonathon Jongsma + + Write vm name to config file as comment + + Change per-guest fullscreen config format + use :;: instead of simply implying the + display from the array index (e.g. ;). This allows you to set + up sparse guest displays (e.g. display 1 + 3). + + For example, to configure display 1 to be fullscreen on monitor 2 and display 2 + to be fullscreen on monitor 3: + + monitor-mapping=1:2;2:3 + + Add a dialog showing details of the current guest + This allows the user to obtain the GUID and vm name of the currently-connected + guest. Obviously, this only works with spice. In the future, it will allow them + to set guest-specific configuration options (using a GUID as a key) + +2014-08-04 Christophe Fergeau + + Fix warning when going in/out of fullscreen + Going to fullscreen, and then exiting causes these messages to show up + on the console: + (remote-viewer:14481): GLib-CRITICAL **: Source ID 784 was not found + when attempting to remove it + + Remove unused RemoteViewerPrivate members + + Remove incorrect G_GNUC_UNUSED from remote_viewer_window_added + The 'app' parameter is used in the function. + + Remove unused VirtViewerNotebook::dispose + The vfunc implementation is only chaining to its parent, removing it + will achieve the same result. + + Chain up to parent's dispose at the end of VirtViewerWindow::dispose + glib documentation says this should be the last thing done in the + dispose() call, which makes sense as this could invalidate still-needed + data in the parent object. + +2014-07-22 Marc-André Lureau + + virt-viewer.xml: remove zoom-{in,out} accelerators + The XML menu accelerators conflict with accelerator set in the code and + prevent using them. This is a regression from d29fc63d. + +2014-07-21 Marc-André Lureau + + Only filter virt-viewer debug messages + Filter only our own debug messages. + + https://bugzilla.redhat.com/show_bug.cgi?id=1118365 + + Always set ask-quit setting + Avoid creating empty settings files, always set the ask-quit key. + + https://bugzilla.redhat.com/show_bug.cgi?id=1006737 + + spice: avoid crash if connection failed without error + spice_channel_get_error() is not guarantee to return a GError. + 2014-07-21 Daniel P. Berrange + + Bump version to 2.0 for next dev cycle Update NEWS for 1.0 release diff --git a/INSTALL b/INSTALL index 007e939..2099840 100644 --- a/INSTALL +++ b/INSTALL @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff --git a/Makefile.am b/Makefile.am index 5046ccf..769fa21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb EXTRA_DIST = \ $(PACKAGE).spec \ + mingw-$(PACKAGE).spec \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ @@ -21,29 +22,18 @@ DISTCLEAN_FILES = \ $(PACKAGE).spec \ + mingw-$(PACKAGE).spec \ intltool-extract \ intltool-merge \ intltool-update \ $(NULL) MAINTAINERCLEANFILES = \ + $(srcdir)/AUTHORS \ $(srcdir)/INSTALL \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/config.h.in \ - $(srcdir)/build-aux/compile \ - $(srcdir)/build-aux/config.guess \ - $(srcdir)/build-aux/config.sub \ - $(srcdir)/build-aux/depcomp \ - $(srcdir)/build-aux/install-sh \ - $(srcdir)/build-aux/ltmain.sh \ - $(srcdir)/build-aux/missing \ + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ $(srcdir)/m4/intltool.m4 \ - $(srcdir)/m4/libtool.m4 \ - $(srcdir)/m4/ltoptions.m4 \ - $(srcdir)/m4/ltsugar.m4 \ - $(srcdir)/m4/ltversion.m4 \ - $(srcdir)/m4/lt~obsolete.m4 \ $(NULL) dist-hook: gen-ChangeLog gen-AUTHORS diff --git a/Makefile.in b/Makefile.in index e141d4c..725d229 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,19 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/mingw-virt-viewer.spec.in \ - $(srcdir)/virt-viewer.spec.in COPYING build-aux/compile \ - build-aux/config.guess build-aux/config.sub \ - build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -99,6 +96,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -162,6 +161,17 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/mingw-virt-viewer.spec.in \ + $(srcdir)/virt-viewer.spec.in $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing AUTHORS COPYING ChangeLog \ + INSTALL NEWS README build-aux/compile build-aux/config.guess \ + build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ + build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -284,6 +294,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -395,6 +406,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb EXTRA_DIST = \ $(PACKAGE).spec \ + mingw-$(PACKAGE).spec \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ @@ -409,29 +421,18 @@ DISTCLEAN_FILES = \ $(PACKAGE).spec \ + mingw-$(PACKAGE).spec \ intltool-extract \ intltool-merge \ intltool-update \ $(NULL) MAINTAINERCLEANFILES = \ + $(srcdir)/AUTHORS \ $(srcdir)/INSTALL \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/config.h.in \ - $(srcdir)/build-aux/compile \ - $(srcdir)/build-aux/config.guess \ - $(srcdir)/build-aux/config.sub \ - $(srcdir)/build-aux/depcomp \ - $(srcdir)/build-aux/install-sh \ - $(srcdir)/build-aux/ltmain.sh \ - $(srcdir)/build-aux/missing \ + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ $(srcdir)/m4/intltool.m4 \ - $(srcdir)/m4/libtool.m4 \ - $(srcdir)/m4/ltoptions.m4 \ - $(srcdir)/m4/ltsugar.m4 \ - $(srcdir)/m4/ltversion.m4 \ - $(srcdir)/m4/lt~obsolete.m4 \ $(NULL) all: config.h @@ -453,7 +454,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -474,8 +474,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -691,10 +691,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -729,16 +735,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -916,6 +923,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + dist-hook: gen-ChangeLog gen-AUTHORS diff --git a/NEWS b/NEWS index 423fb38..67c6aa7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,103 @@ Virt Viewer News ================ + +3.1: Dec 17, 2015 +----------------- + + - Refresh translations + +3.0: Dec 3, 2015 +---------------- + + - Last release to support GTK2 for Linux. The next + 4.0 release will be GTK3 only. + - Don't add URI scheme / path info to oVirt URIs + - Require spice-gtk >= 0.30 + - Enable webdav folder sharing with spice + - Add preferences UI dialog + - Take --direct into account when checking if guest is + reachable + - Take SPICE proxy into account when connecting to oVirt + instances + - Fail gracefully when hostname is not returned by + oVirt + - Don't show empty foreign menu on secondary displays + - Avoid accidentally trying to connect to port 0 when + oVirt doesn't specify a port number + - Correctly update geometry when enabling/disabling + display heads + - Avoid accidentally creating extra monitors when using + configuration file monitor mapping + - Exit normally when cancelling connect dialog + - Don't wait for a guest that we know will never show up + - Fix crash when using --reconnect with SPICE + - Avoid zooming out if it would decrease window size + below minimum required for top menu display + - Fix crash when disabling last enabled display + - Honour changes in display position from guest + - Don't show error dialog twice for unknown graphics type + - Allow to cancel oVirt auth without error + - Set sensitivity of display menu based on whether it is + usable or not + - Set sensitivity of tool bar buttons based on whether they + are usable or not + - Set guest name reported by VNC + - Fix crash when using gtk-vnc 0.3.8 + - Fix alt-tab behaviour in choose VM dialog + - Don't allow missing display in monitor mapping config + - Add --with-osid flag to configure to allow specifying + the operating system build target. The values should + be based on libosinfo OS short IDs. + - Ensure windows installer places menu icon for all users + not just admin. Requires manual uninstall of previous + windows version + - Require address in remote viewer connect dialog + - Automatically retry VNC connection after auth failure + - Drop GTK2 support for Windows builds + - Enable keepalives on libvirt conncetion + - Allow resize of window to arbitrary size + - Fix thread safety handling event callbacks + - Avoid deprecation warnings with newer glib + - Pulled in multiple fixes for event loop from libvirt-glib + - Fix misc bugs reported by coverity + - Fix binary ID in MSI installer + - Stop polling libvirt after reconnceting to libvirt + +2.0: Jan 12, 2015 +----------------- + + - Fix handling of zoom in/out accelerators + - Fix warning going in/out of fullscreen + - Add dialog showing info about the current guest + - Change format of fullscreen config setting to + allow for sparse guest displays + - Write VM name to config file as a comment + - Never use fallback CA certs when loading vv-file + - Remove extraneous '/' from oVirt URIs + - Support oVirt foreign menus + - Allow using numapad for zoom in/out accelerators + - Force geometry update when agent connects + - Fix misc crash bugs + - Fix misc memory leaks + - Allow viewing of password entry characters + - Don't fail when auth dialog is cancelled + - Only create extra windows on demand + - Use more sensible default window size + - Improve docs for URIs and config files + - Allow cancellation of SPICE auth dialog + - Use new libvirt API for --attach to avoid SELinux AVC + - Allow removable of CD images with oVirt connections + - Show VM choose dialog when oVirt VM name is missing + - Support usernames request with SASL auth + - Use socat instead of nc if available + - Use PNG instead of SVG for icons + - Support connection to UNIX sockets instead of TCP + - Honour zoom level from CLI args with VNC + - Switch to GTK3 instead of GKT2 for Windows builds + - Ensure dialogs have transient parent set + - Switch to gstreamer 1.0 instead of 0.10 for Windows builds + - Avoid accidentally connecting to localhost with VNC/SPICE + - Use a versioned install directory for Windows builds 1.0: Jul 21, 2014 ----------------- diff --git a/README b/README index 8170b59..289bc86 100644 --- a/README +++ b/README @@ -19,7 +19,7 @@ http://gtk-vnc.sourceforge.net/ -Virt Viewer uses the SPICE-GTK (>= 0.22) widget to provide a +Virt Viewer uses the SPICE-GTK (>= 0.30) widget to provide a display of the SPICE protocol, which is available from: http://spice-space.org/page/Spice-Gtk diff --git a/aclocal.m4 b/aclocal.m4 index 39152b2..bfa6b35 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -457,7 +457,7 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -704,7 +704,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -716,10 +716,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -735,14 +735,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -787,15 +787,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -826,7 +825,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1017,7 +1016,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1093,7 +1092,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1101,6 +1100,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -1177,8 +1182,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -1210,6 +1215,51 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -1217,7 +1267,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header @@ -1240,7 +1289,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1251,7 +1300,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -1261,7 +1310,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1282,7 +1331,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1330,41 +1379,9 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1403,7 +1420,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1432,9 +1449,73 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1515,7 +1596,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1575,7 +1656,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1603,7 +1684,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1622,7 +1703,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/build-aux/compile b/build-aux/compile index 531136b..a85b723 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/config.guess b/build-aux/config.guess index 1804e9f..dbfb978 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,10 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. - -timestamp='2012-12-29' +# Copyright 1992-2015 Free Software Foundation, Inc. + +timestamp='2015-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -26,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -52,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -135,6 +131,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac # Note: order is significant - the case branches are not exclusive. @@ -562,8 +579,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -809,7 +827,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -857,21 +875,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -884,59 +902,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -955,54 +968,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1235,19 +1257,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1338,154 +1372,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -70,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,19 +252,20 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ - | fido | fr30 | frv \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -286,23 +283,26 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -313,6 +313,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -327,7 +328,10 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -369,13 +373,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -384,6 +388,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -403,18 +408,22 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -432,6 +441,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -769,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -796,7 +809,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -824,6 +837,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -832,7 +849,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1354,7 +1371,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1369,14 +1386,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1500,9 +1517,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1550,6 +1564,9 @@ ;; c4x-* | tic4x-*) os=-coff + ;; + c8051-*) + os=-elf ;; hexagon-*) os=-elf diff --git a/build-aux/depcomp b/build-aux/depcomp index 4ebd5b3..fc98710 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/install-sh b/build-aux/install-sh index 377bb86..0b0fdcb 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. +IFS=" $tab$nl" + +# Set DOITPROG to "echo" to test this script. + doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,45 +122,56 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done + +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - - eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index 63ae69d..0f0a2da 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -1,9 +1,12 @@ - -# libtool (GNU libtool) 2.4.2 +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 + +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,166 +26,670 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . +# along with this program. If not, see . + PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +VERSION=2.4.6 +package_revision=2.4.6 + + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" + +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + + +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. + +: ${CP="cp -f"} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} +: ${MAKE="make"} +: ${MKDIR="mkdir"} +: ${MV="mv -f"} +: ${RM="rm -f"} +: ${SHELL="${CONFIG_SHELL-/bin/sh}"} + + +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## + +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' + +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' + +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" + + +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. + +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. + +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: + +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh # is ksh but when the shell is invoked as "sh" and the current value of # the _XPG environment variable is not equal to 1 (one), the special # positional parameter $0, within a function call, is the name of the # function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement +progpath=$0 + +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` + +# Make sure we have an absolute progpath for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` + progdir=`cd "$progdir" && pwd` + progpath=$progdir/$progname + ;; + *) + _G_IFS=$IFS + IFS=${PATH_SEPARATOR-:} + for progdir in $PATH; do + IFS=$_G_IFS + test -x "$progdir/$progname" && break + done + IFS=$_G_IFS + test -n "$progdir" || progdir=`pwd` + progpath=$progdir/$progname + ;; +esac + + +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. + +opt_dry_run=false +opt_quiet=false +opt_verbose=false + +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } + + require_term_colors=: +} + + +## ----------------- ## +## Function library. ## +## ----------------- ## + +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. + + +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. + + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- # Compute the dirname of FILE. If nonempty, add APPEND to the result, # otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function +eval 'func_dirname () +{ + $debug_cmd + + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function # call: # dirname: Compute the dirname of FILE. If nonempty, # add APPEND to the result, otherwise set result @@ -190,263 +697,327 @@ # value returned in "$func_dirname_result" # basename: Compute filename of FILE. # value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $debug_cmd + + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= + + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then + + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$_G_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + _G_dir_list=$_G_directory_path:$_G_dir_list + + # If the last portion added has no slash in it, the list is done + case $_G_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` + done + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` + + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$_G_dir" 2>/dev/null || : + done + IFS=$func_mkdir_p_IFS + + # Bail out if we (or some other process) failed to create a directory. + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" + fi +} + + +# func_mktempdir [BASENAME] +# ------------------------- +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, BASENAME is the basename for that directory. +func_mktempdir () +{ + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} + + if test : = "$opt_dry_run"; then + # Return a directory name, but don't create it in dry-run mode + _G_tmpdir=$_G_template-$$ else - func_dirname_result="$func_dirname_result${2}" + + # If mktemp works, use that first and foremost + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` + + if test ! -d "$_G_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' + + $ECHO "$_G_tmpdir" +} + # func_normal_abspath PATH +# ------------------------ # Remove doubled-up and trailing slashes, "." path components, # and cancel out any ".." path components in PATH after making # it an absolute path. -# value returned in "$func_normal_abspath_result" func_normal_abspath () { - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ fi break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} # A bug in bash halts the script if the last line of a function # fails when set -e is in force, so we need another command to @@ -454,450 +1025,1113 @@ : } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + : } -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" fi - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- # Aesthetically quote ARG to be evaled later; same as above, # but do not quote variable references. func_quote_for_expand () { + $debug_cmd + case $1 in *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; *) - my_arg="$1" ;; + _G_arg=$1 ;; esac - case $my_arg in + case $_G_arg in # Double-quote args containing shell metacharacters to delay # word splitting and command substitution for a subsequent eval. # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" + _G_arg=\"$_G_arg\" ;; esac - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP # is given, then evaluate it. func_show_eval () { - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP # is given, then evaluate it. Use the saved locale for evaluation. func_show_eval_locale () { - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" eval "func_echo $func_quote_for_expand_result" } - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" fi - fi -} + } +} + # func_tr_sh +# ---------- # Turn $1 into a string suitable for a shell variable name. # Result is stored in $func_tr_sh_result. All characters # not in the set a-zA-Z0-9_ are replaced with '_'. Further, # if $1 begins with a digit, a '_' is prepended as well. func_tr_sh () { - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program 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 General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd + + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} + + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} + + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result +} + + +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () +{ + $debug_cmd + + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result +} + + +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () +{ + $debug_cmd + + func_parse_options_result= + + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift + + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break + + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; + + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result +} + + +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () +{ + $debug_cmd + + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + + func_run_hooks func_validate_options ${1+"$@"} + + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result +} + + + +## ----------------- ## +## Helper functions. ## +## ----------------- ## + +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname + $debug_cmd + + func_usage_message + $ECHO "$long_help_message" + exit 0 +} + + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug - - func_error "missing argument for $1." + $debug_cmd + + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () +{ + $debug_cmd + + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} + + +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () +{ + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} + + +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + + exit $? +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: + +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' + + +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () +{ + $debug_cmd + + $warning_func ${1+"$@"} +} + + +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" + +# Additional text appended to 'usage_message' in response to '--help'. +func_help () +{ + $debug_cmd + + func_usage_message + $ECHO "$long_help_message + +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi + + +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Global variable: + tagname=$1 + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac + + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF + fi + + exit $EXIT_MISMATCH fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; +} + + +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + + nonopt= + preserve_args= + + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" + + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep + + +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd + + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; + + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options + + + +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } + + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result +} +func_add_hook func_validate_options libtool_validate_options + + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do + IFS=$sp$nl + eval cmd=\"$cmd\" IFS=$save_ifs - eval cmd=\"$cmd\" func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are +All other options (arguments beginning with '-') are ignored. + +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. + +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes + func_fatal_error "invalid libtool wrapper script '$wrapper'" + + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3530,6 +4883,32 @@ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" } # func_win32_libid arg @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3656,30 +5051,6 @@ # # Of those that remain, print the first one. $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" } # func_cygming_dll_for_implib_fallback ARG @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then + xdir=$func_dirname_result + + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + pic_object=$xdir$pic_object + + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,22 +7030,27 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; esac fi func_append deplibs " $arg" + continue + ;; + + -mllvm) + prev=mllvm continue ;; @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5698,6 +7113,11 @@ -objectlist) prev=objectlist + continue + ;; + + -os2dllname) + prev=os2dllname continue ;; @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then + xdir=$func_dirname_result + + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + pic_object=$xdir$pic_object + + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + func_fatal_help "the '$prevarg' option requires an argument" + + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" + func_warning "'$deplib' seems to be moved" + + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" + } + + if test prog,link = "$linkmode,$pass"; then + vars="compile_deplibs finalize_deplibs" else - vars="compile_deplibs finalize_deplibs" + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" + + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" + + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current ;; + sco) + major=.$current + versuffix=.$current + ;; + sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then + test " " = "$libobjs" && libobjs= + + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs + + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then + } + + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + func_warning "'-release' is ignored for programs" + + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then + finalize_rpath=$rpath + + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff --git a/build-aux/missing b/build-aux/missing index cdea514..f62bbae 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff --git a/build-aux/test-driver b/build-aux/test-driver new file mode 100755 index 0000000..8e575b0 --- /dev/null +++ b/build-aux/test-driver @@ -0,0 +1,148 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/config.h.in b/config.h.in index 548921c..b142fcf 100644 --- a/config.h.in +++ b/config.h.in @@ -51,6 +51,9 @@ /* Have libgovirt? */ #undef HAVE_OVIRT +/* Have rest_proxy_auth_cancel and OVIRT_REST_CALL_ERROR_CANCELLED? */ +#undef HAVE_OVIRT_CANCEL + /* Define to 1 if you have the `socketpair' function. */ #undef HAVE_SOCKETPAIR @@ -84,15 +87,14 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Have virDomainOpenGraphicsFD? */ +#undef HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD + /* Define to 1 if you have the header file. */ #undef HAVE_WINDOWS_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O /* Name of package */ #undef PACKAGE @@ -115,6 +117,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* OS ID for this build */ +#undef REMOTE_VIEWER_OS_ID + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/configure b/configure index aa3ad9f..49ec643 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for virt-viewer 1.0. +# Generated by GNU Autoconf 2.69 for virt-viewer 3.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='virt-viewer' PACKAGE_TARNAME='virt-viewer' -PACKAGE_VERSION='1.0' -PACKAGE_STRING='virt-viewer 1.0' +PACKAGE_VERSION='3.1' +PACKAGE_STRING='virt-viewer 3.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -639,6 +639,8 @@ UPDATE_MIME_DATABASE WINDOWS_PRODUCTVERSION BUILDID +HAVE_OVIRT_FALSE +HAVE_OVIRT_TRUE OVIRT_LIBS OVIRT_CFLAGS HAVE_SPICE_GTK_FALSE @@ -726,6 +728,7 @@ WINDRES ICOTOOL CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -859,6 +862,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -870,6 +874,7 @@ with_gtk_vnc with_spice_gtk with_ovirt +with_osid with_buildid enable_update_mimedb ' @@ -881,6 +886,7 @@ LDFLAGS LIBS CPPFLAGS +LT_SYS_LIBRARY_PATH CPP PKG_CONFIG PKG_CONFIG_PATH @@ -1443,7 +1449,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures virt-viewer 1.0 to adapt to many kinds of systems. +\`configure' configures virt-viewer 3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1513,7 +1519,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of virt-viewer 1.0:";; + short | recursive ) echo "Configuration of virt-viewer 3.1:";; esac cat <<\_ACEOF @@ -1544,14 +1550,18 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --without-libvirt Ignore presence of libvirt and disable it --with-gtk=2.0|3.0 which gtk+ version to compile against (default: 3.0) --without-gtk-vnc Ignore presence of gtk-vnc and disable it --without-spice-gtk Ignore presence of spice-gtk and disable it --without-ovirt Ignore presence of librest and disable oVirt support + --with-osid=id Set OS ID for use in .vv files --with-buildid=id Set additional build version details Some influential environment variables: @@ -1562,6 +1572,8 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -1667,7 +1679,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -virt-viewer configure 1.0 +virt-viewer configure 3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2032,7 +2044,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by virt-viewer $as_me 1.0, which was +It was created by virt-viewer $as_me 3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2413,7 +2425,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.13' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2585,8 +2597,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2605,7 +2617,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2899,7 +2911,7 @@ # Define the identity of the package. PACKAGE='virt-viewer' - VERSION='1.0' + VERSION='3.1' cat >>confdefs.h <<_ACEOF @@ -2933,8 +2945,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2949,6 +2961,48 @@ + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -3071,9 +3125,9 @@ GTK3_REQUIRED="3.0" GTK_VNC1_REQUIRED="0.3.8" GTK_VNC2_REQUIRED="0.4.0" -SPICE_GTK_REQUIRED="0.22" -SPICE_PROTOCOL_REQUIRED="0.10.1" -GOVIRT_REQUIRED="0.3.0" +SPICE_GTK_REQUIRED="0.30" +SPICE_PROTOCOL_REQUIRED="0.12.7" +GOVIRT_REQUIRED="0.3.2" @@ -3904,6 +3958,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4096,131 +4209,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - case `pwd` in *\ * | *\ *) @@ -4230,22 +4218,22 @@ -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" +macro_version='2.4.6' +macro_revision='2.4.6' + + + + + + + + + + + + + +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -4294,7 +4282,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -4617,19 +4605,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -4643,7 +4631,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -4654,7 +4642,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -4665,32 +4653,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -4733,33 +4721,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_cv_path_NM=$NM +else + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -4770,15 +4763,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -4884,9 +4877,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -4894,8 +4887,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -4946,7 +4939,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -4986,7 +4979,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5036,22 +5029,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -5069,7 +5063,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -5086,30 +5080,6 @@ : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset @@ -5233,13 +5203,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5367,13 +5337,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5400,8 +5370,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5435,10 +5404,6 @@ else lt_cv_deplibs_check_method=pass_all fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all ;; haiku*) @@ -5479,7 +5444,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5501,8 +5466,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -5555,6 +5520,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -5712,8 +5680,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -5725,7 +5693,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -5880,7 +5848,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -5888,7 +5856,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -5901,7 +5869,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -6118,7 +6086,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6208,7 +6176,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6241,14 +6209,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6266,21 +6264,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6328,11 +6329,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6358,7 +6359,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6378,13 +6379,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6405,7 +6406,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6458,6 +6459,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -6470,9 +6481,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6482,8 +6493,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -6495,18 +6506,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6515,24 +6607,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -6561,9 +6654,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6577,7 +6711,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -6622,7 +6763,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -6662,13 +6803,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6680,7 +6822,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -6689,7 +6831,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -6705,7 +6847,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -6816,7 +6958,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7319,7 +7461,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7337,7 +7479,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7376,7 +7518,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -7405,7 +7547,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7418,38 +7560,73 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= fi ;; esac + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7754,14 +7931,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7785,14 +7962,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7816,22 +7993,20 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else pic_mode=default fi - -test -z "$pic_mode" && pic_mode=default @@ -7848,14 +8023,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7869,11 +8044,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -7922,7 +8149,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -7961,7 +8188,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -7972,14 +8199,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" +with_gnu_ld=$lt_cv_prog_gnu_ld + +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -7988,15 +8215,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8011,22 +8231,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8049,13 +8269,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8077,22 +8297,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8115,13 +8335,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8142,7 +8362,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8204,7 +8424,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8220,7 +8440,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8250,7 +8470,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8268,17 +8488,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8289,8 +8510,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8306,6 +8527,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8376,7 +8602,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8384,10 +8610,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8403,7 +8648,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8412,9 +8657,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8438,6 +8683,12 @@ lt_prog_compiler_wl='-Wl,-Wl,,' lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, @@ -8536,7 +8787,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -8565,7 +8816,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -8597,7 +8848,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8627,7 +8878,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -8659,7 +8910,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -8678,13 +8929,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -8804,8 +9055,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -8817,9 +9068,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -8862,9 +9113,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -8879,7 +9130,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -8887,7 +9138,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -8897,7 +9148,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -8919,24 +9170,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -8949,7 +9200,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -8968,7 +9219,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -8984,7 +9235,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -8994,7 +9245,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9002,61 +9253,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9067,42 +9346,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9116,8 +9400,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9135,8 +9419,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9148,7 +9432,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9163,9 +9447,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9182,15 +9466,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9206,7 +9490,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9214,34 +9498,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9260,13 +9567,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac + + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9285,35 +9600,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9348,7 +9670,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9356,17 +9678,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9401,7 +9723,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9409,21 +9731,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9432,7 +9766,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9462,16 +9796,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -9480,18 +9815,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -9500,7 +9835,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -9519,24 +9854,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9578,33 +9913,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -9612,25 +9947,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -9642,7 +9977,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9661,14 +9996,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -9676,8 +10011,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -9688,7 +10023,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -9699,8 +10034,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -9710,8 +10045,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -9723,22 +10058,32 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes + ;; + + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; netbsd*) @@ -9755,7 +10100,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -9763,27 +10108,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -9794,33 +10131,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -9831,24 +10188,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -9858,11 +10215,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -9872,10 +10229,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -9924,43 +10281,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -9975,10 +10332,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -9986,7 +10343,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10012,7 +10369,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10227,14 +10584,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -10250,28 +10607,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10285,7 +10649,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10294,7 +10658,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10311,14 +10675,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10326,41 +10692,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10370,18 +10786,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10389,8 +10805,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10402,7 +10818,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10411,8 +10827,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -10428,17 +10844,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -10447,8 +10863,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -10475,7 +10891,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -10488,8 +10904,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -10502,7 +10918,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -10515,8 +10931,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -10529,8 +10945,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10548,12 +10964,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -10578,26 +10995,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10615,14 +11021,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -10630,8 +11037,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -10640,8 +11047,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -10654,8 +11061,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10666,7 +11073,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -10674,8 +11081,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -10694,8 +11101,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -10704,13 +11111,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10757,11 +11184,15 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10778,12 +11209,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -10793,7 +11224,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -10802,58 +11233,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -10864,8 +11305,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -10875,11 +11316,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -10887,8 +11328,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -10909,24 +11350,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -10944,7 +11385,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -10952,8 +11393,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10963,19 +11404,34 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +fi + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +fi + +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + @@ -11073,15 +11529,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11096,12 +11552,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11111,7 +11567,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11121,23 +11577,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11175,21 +11631,29 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +else + + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes fi + ;; + + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no ;; *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -11228,11 +11692,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -11271,7 +11735,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -11310,7 +11774,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -11349,7 +11813,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11370,21 +11834,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no + else enable_dlopen=yes - else - enable_dlopen=no fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11392,7 +11856,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11439,9 +11903,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11471,7 +11935,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11491,14 +11955,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11545,9 +12009,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11577,7 +12041,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11598,9 +12062,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -11644,7 +12108,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -11672,7 +12136,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -11680,13 +12144,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -11694,8 +12158,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -11705,7 +12173,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -11719,7 +12187,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -13262,44 +13730,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - @@ -13617,7 +14047,20 @@ fi -if test "x$with_libvirt" != "xno"; then : +if test "x$with_libvirt" != "xno" && test "x$with_libvirt" != "xyes"; then : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt >= \$LIBVIRT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libvirt >= $LIBVIRT_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + with_libvirt=yes +else + with_libvirt=no +fi +fi + +if test "x$with_libvirt" = "xyes"; then : pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVIRT" >&5 @@ -13677,34 +14120,44 @@ # Put the nasty error message in config.log where it belongs echo "$LIBVIRT_PKG_ERRORS" >&5 - have_libvirt=no + as_fn_error $? "Package requirements (libvirt >= $LIBVIRT_REQUIRED) were not met: + +$LIBVIRT_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBVIRT_CFLAGS +and LIBVIRT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libvirt=no + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables LIBVIRT_CFLAGS +and LIBVIRT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else LIBVIRT_CFLAGS=$pkg_cv_LIBVIRT_CFLAGS LIBVIRT_LIBS=$pkg_cv_LIBVIRT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libvirt=yes -fi -else - have_libvirt=no -fi - -if test "x$have_libvirt" = "xyes"; then : + +fi $as_echo "#define HAVE_LIBVIRT 1" >>confdefs.h -else - if test "x$with_libvirt" = "xyes"; then : - as_fn_error $? "libvirt requested but not found" "$LINENO" 5 - -fi - -fi - if test "x$have_libvirt" = "xyes"; then + +fi + if test "x$with_libvirt" = "xyes"; then HAVE_LIBVIRT_TRUE= HAVE_LIBVIRT_FALSE='#' else @@ -13712,6 +14165,53 @@ HAVE_LIBVIRT_FALSE= fi + +old_LIBS=$LIBS +LIBS=$LIBVIRT_LIBS +# virDomainOpenGraphicsFD was introduced in libvirt 1.2.8 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for virDomainOpenGraphicsFD in -lvirt" >&5 +$as_echo_n "checking for virDomainOpenGraphicsFD in -lvirt... " >&6; } +if ${ac_cv_lib_virt_virDomainOpenGraphicsFD+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lvirt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char virDomainOpenGraphicsFD (); +int +main () +{ +return virDomainOpenGraphicsFD (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_virt_virDomainOpenGraphicsFD=yes +else + ac_cv_lib_virt_virDomainOpenGraphicsFD=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_virt_virDomainOpenGraphicsFD" >&5 +$as_echo "$ac_cv_lib_virt_virDomainOpenGraphicsFD" >&6; } +if test "x$ac_cv_lib_virt_virDomainOpenGraphicsFD" = xyes; then : + +$as_echo "#define HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD 1" >>confdefs.h + +fi + +LIBS=$old_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking which gtk+ version to compile against" >&5 $as_echo_n "checking which gtk+ version to compile against... " >&6; } @@ -13863,7 +14363,20 @@ fi -if test "x$with_gtk_vnc" != "xno"; then : +if test "x$with_gtk_vnc" != "xno" && test "x$with_gtk_vnc" != "xyes"; then : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-vnc-\$GTK_VNC_API_VERSION >= \$GTK_VNC_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + with_gtk_vnc=yes +else + with_gtk_vnc=no +fi +fi + +if test "x$with_gtk_vnc" = "xyes"; then : pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_VNC" >&5 @@ -13923,34 +14436,44 @@ # Put the nasty error message in config.log where it belongs echo "$GTK_VNC_PKG_ERRORS" >&5 - have_gtk_vnc=no + as_fn_error $? "Package requirements (gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED) were not met: + +$GTK_VNC_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTK_VNC_CFLAGS +and GTK_VNC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_gtk_vnc=no + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTK_VNC_CFLAGS +and GTK_VNC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else GTK_VNC_CFLAGS=$pkg_cv_GTK_VNC_CFLAGS GTK_VNC_LIBS=$pkg_cv_GTK_VNC_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_gtk_vnc=yes -fi -else - have_gtk_vnc=no -fi - -if test "x$have_gtk_vnc" = "xyes"; then : + +fi $as_echo "#define HAVE_GTK_VNC 1" >>confdefs.h -else - if test "x$with_gtk_vnc" = "xyes"; then : - as_fn_error $? "gtk-vnc requested but not found" "$LINENO" 5 - -fi - -fi - if test "x$have_gtk_vnc" = "xyes"; then + +fi + if test "x$with_gtk_vnc" = "xyes"; then HAVE_GTK_VNC_TRUE= HAVE_GTK_VNC_FALSE='#' else @@ -13966,7 +14489,22 @@ fi -if test "x$with_spice_gtk" != "xno"; then : +if test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"; then : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spice-client-gtk-\$SPICE_GTK_API_VERSION >= \$SPICE_GTK_REQUIRED + spice-controller spice-protocol >= \$SPICE_PROTOCOL_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED + spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + with_spice_gtk=yes +else + with_spice_gtk=no +fi +fi + +if test "x$with_spice_gtk" = "xyes"; then : pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPICE_GTK" >&5 @@ -14026,23 +14564,38 @@ # Put the nasty error message in config.log where it belongs echo "$SPICE_GTK_PKG_ERRORS" >&5 - have_spice_gtk=no + as_fn_error $? "Package requirements (spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED) were not met: + +$SPICE_GTK_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables SPICE_GTK_CFLAGS +and SPICE_GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_spice_gtk=no + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables SPICE_GTK_CFLAGS +and SPICE_GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else SPICE_GTK_CFLAGS=$pkg_cv_SPICE_GTK_CFLAGS SPICE_GTK_LIBS=$pkg_cv_SPICE_GTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_spice_gtk=yes -fi -else - have_spice_gtk=no -fi - -if test "x$have_spice_gtk" = "xyes"; then : + +fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPICE_CONTROLLER" >&5 @@ -14228,14 +14781,9 @@ $as_echo "#define HAVE_SPICE_GTK 1" >>confdefs.h -else - if test "x$with_spice_gtk" = "xyes"; then : - as_fn_error $? "spice-gtk requested but not found" "$LINENO" 5 - -fi - -fi - if test "x$have_spice_gtk" = "xyes"; then + +fi + if test "x$with_spice_gtk" = "xyes"; then HAVE_SPICE_GTK_TRUE= HAVE_SPICE_GTK_FALSE='#' else @@ -14251,7 +14799,20 @@ fi -if test "x$with_ovirt" != "xno"; then : +if test "x$with_ovirt" != "xno" && test "x$with_ovirt" != "xyes"; then : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"govirt-1.0 >= \$GOVIRT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "govirt-1.0 >= $GOVIRT_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + with_ovirt=yes +else + with_ovirt=no +fi +fi + +if test "x$with_ovirt" = "xyes"; then : pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OVIRT" >&5 @@ -14311,33 +14872,75 @@ # Put the nasty error message in config.log where it belongs echo "$OVIRT_PKG_ERRORS" >&5 - have_ovirt=no + as_fn_error $? "Package requirements (govirt-1.0 >= $GOVIRT_REQUIRED) were not met: + +$OVIRT_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables OVIRT_CFLAGS +and OVIRT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_ovirt=no + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables OVIRT_CFLAGS +and OVIRT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else OVIRT_CFLAGS=$pkg_cv_OVIRT_CFLAGS OVIRT_LIBS=$pkg_cv_OVIRT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_ovirt=yes -fi -else - have_ovirt=no -fi - -if test "x$have_ovirt" = "xyes"; then : + +fi $as_echo "#define HAVE_OVIRT 1" >>confdefs.h -else - if test "x$with_ovirt" = "xyes"; then : - as_fn_error $? "oVirt support requested but libgovirt not found" "$LINENO" 5 - -fi - -fi + SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + CFLAGS="$OVIRT_CFLAGS" + LIBS="$OVIRT_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +static int err = OVIRT_REST_CALL_ERROR_CANCELLED; + void *fun = rest_proxy_auth_cancel; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_OVIRT_CANCEL 1" >>confdefs.h + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVED_CFLAGS" + LIBS="$SAVED_LIBS" + +fi + if test "x$with_ovirt" = "xyes"; then + HAVE_OVIRT_TRUE= + HAVE_OVIRT_FALSE='#' +else + HAVE_OVIRT_TRUE='#' + HAVE_OVIRT_FALSE= +fi + for ac_header in sys/socket.h sys/un.h windows.h do : @@ -14366,8 +14969,22 @@ -if test "x$have_gtk_vnc" != "xyes" && test "x$have_spice_gtk" != "xyes"; then +if test "x$with_gtk_vnc" != "xyes" && test "x$with_spice_gtk" != "xyes"; then as_fn_error $? "At least one of spice or vnc must be used" "$LINENO" 5 +fi + + +# Check whether --with-osid was given. +if test "${with_osid+set}" = set; then : + withval=$with_osid; +fi + +if test -n "$with_osid"; then + +cat >>confdefs.h <<_ACEOF +#define REMOTE_VIEWER_OS_ID "$with_osid" +_ACEOF + fi @@ -14379,12 +14996,21 @@ fi +if test "x$buildid" != "x0"; then + cat >>confdefs.h <<_ACEOF -#define BUILDID "$buildid" +#define BUILDID "-$buildid" _ACEOF -BUILDID="$buildid" - + BUILDID="-$buildid" + +else + +cat >>confdefs.h <<_ACEOF +#define BUILDID "" +_ACEOF + +fi major=`echo $PACKAGE_VERSION | cut -d. -f1` minor=`echo $PACKAGE_VERSION | cut -d. -f2` @@ -14451,7 +15077,7 @@ -ac_config_files="$ac_config_files Makefile data/Makefile data/virt-viewer.wxs data/virt-viewer.nsis data/virt-viewer-debug.nsis icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile icons/256x256/Makefile man/Makefile mingw-virt-viewer.spec po/Makefile.in src/Makefile src/virt-viewer.rc virt-viewer.spec" +ac_config_files="$ac_config_files Makefile data/Makefile data/adwaita-icons-needed.wxi data/virt-viewer.wxs data/virt-viewer.nsis data/virt-viewer-debug.nsis icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile icons/256x256/Makefile man/Makefile mingw-virt-viewer.spec po/Makefile.in src/Makefile src/virt-viewer.rc virt-viewer.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14614,6 +15240,10 @@ as_fn_error $? "conditional \"HAVE_SPICE_GTK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_OVIRT_TRUE}" && test -z "${HAVE_OVIRT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_OVIRT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_UPDATE_MIMEDB_TRUE}" && test -z "${ENABLE_UPDATE_MIMEDB_FALSE}"; then as_fn_error $? "conditional \"ENABLE_UPDATE_MIMEDB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -15015,7 +15645,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by virt-viewer $as_me 1.0, which was +This file was extended by virt-viewer $as_me 3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15085,7 +15715,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -virt-viewer config.status 1.0 +virt-viewer config.status 3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15220,6 +15850,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -15269,10 +15900,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -15337,7 +15971,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -15388,9 +16023,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -15425,7 +16063,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -15452,10 +16090,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -15464,19 +16103,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' - -# See if we are running on zsh, and set the options which allow our + +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -15500,6 +16136,7 @@ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/adwaita-icons-needed.wxi") CONFIG_FILES="$CONFIG_FILES data/adwaita-icons-needed.wxi" ;; "data/virt-viewer.wxs") CONFIG_FILES="$CONFIG_FILES data/virt-viewer.wxs" ;; "data/virt-viewer.nsis") CONFIG_FILES="$CONFIG_FILES data/virt-viewer.nsis" ;; "data/virt-viewer-debug.nsis") CONFIG_FILES="$CONFIG_FILES data/virt-viewer-debug.nsis" ;; @@ -16239,55 +16876,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool 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 General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -16306,6 +16941,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install + +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -16424,17 +17062,26 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot + +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -16526,8 +17173,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -16620,13 +17270,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -16675,6 +17325,65 @@ hardcode_action=$hardcode_action # ### END LIBTOOL CONFIG + +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE _LT_EOF @@ -16684,7 +17393,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -16693,7 +17402,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -16702,165 +17411,6 @@ # is reportedly fixed, but why not run on old versions too? sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") diff --git a/configure.ac b/configure.ac index f1b0d1c..898182e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT([virt-viewer],[1.0]) +AC_INIT([virt-viewer],[3.1]) AC_CONFIG_SRCDIR(src/virt-viewer-main.c) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -19,9 +19,9 @@ GTK3_REQUIRED="3.0" GTK_VNC1_REQUIRED="0.3.8" GTK_VNC2_REQUIRED="0.4.0" -SPICE_GTK_REQUIRED="0.22" -SPICE_PROTOCOL_REQUIRED="0.10.1" -GOVIRT_REQUIRED="0.3.0" +SPICE_GTK_REQUIRED="0.30" +SPICE_PROTOCOL_REQUIRED="0.12.7" +GOVIRT_REQUIRED="0.3.2" AC_SUBST([GLIB2_REQUIRED]) AC_SUBST([LIBXML2_REQUIRED]) @@ -103,19 +103,23 @@ AC_ARG_WITH([libvirt], AS_HELP_STRING([--without-libvirt], [Ignore presence of libvirt and disable it])) -AS_IF([test "x$with_libvirt" != "xno"], - [PKG_CHECK_MODULES(LIBVIRT, - [libvirt >= $LIBVIRT_REQUIRED], - [have_libvirt=yes], [have_libvirt=no])], - [have_libvirt=no]) - -AS_IF([test "x$have_libvirt" = "xyes"], - [AC_DEFINE([HAVE_LIBVIRT], 1, [Have libvirt?])], - [AS_IF([test "x$with_libvirt" = "xyes"], - [AC_MSG_ERROR([libvirt requested but not found]) - ]) -]) -AM_CONDITIONAL([HAVE_LIBVIRT], [test "x$have_libvirt" = "xyes"]) +AS_IF([test "x$with_libvirt" != "xno" && test "x$with_libvirt" != "xyes"], + [PKG_CHECK_EXISTS([libvirt >= $LIBVIRT_REQUIRED], + [with_libvirt=yes], [with_libvirt=no])]) + +AS_IF([test "x$with_libvirt" = "xyes"], + [PKG_CHECK_MODULES(LIBVIRT, [libvirt >= $LIBVIRT_REQUIRED])] + [AC_DEFINE([HAVE_LIBVIRT], 1, [Have libvirt?])] +) +AM_CONDITIONAL([HAVE_LIBVIRT], [test "x$with_libvirt" = "xyes"]) + +old_LIBS=$LIBS +LIBS=$LIBVIRT_LIBS +# virDomainOpenGraphicsFD was introduced in libvirt 1.2.8 +AC_CHECK_LIB([virt], + [virDomainOpenGraphicsFD], + [AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have virDomainOpenGraphicsFD?])]) +LIBS=$old_LIBS AC_MSG_CHECKING([which gtk+ version to compile against]) AC_ARG_WITH([gtk], @@ -153,68 +157,81 @@ AC_ARG_WITH([gtk-vnc], AS_HELP_STRING([--without-gtk-vnc], [Ignore presence of gtk-vnc and disable it])) -AS_IF([test "x$with_gtk_vnc" != "xno"], - [PKG_CHECK_MODULES(GTK_VNC, - gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED, - [have_gtk_vnc=yes], [have_gtk_vnc=no])], - [have_gtk_vnc=no]) - -AS_IF([test "x$have_gtk_vnc" = "xyes"], - [AC_DEFINE([HAVE_GTK_VNC], 1, [Have gtk-vnc?])], - [AS_IF([test "x$with_gtk_vnc" = "xyes"], - [AC_MSG_ERROR([gtk-vnc requested but not found]) - ]) -]) -AM_CONDITIONAL([HAVE_GTK_VNC], [test "x$have_gtk_vnc" = "xyes"]) +AS_IF([test "x$with_gtk_vnc" != "xno" && test "x$with_gtk_vnc" != "xyes"], + [PKG_CHECK_EXISTS([gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED], + [with_gtk_vnc=yes], [with_gtk_vnc=no])]) + +AS_IF([test "x$with_gtk_vnc" = "xyes"], + [PKG_CHECK_MODULES(GTK_VNC, [gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED])] + [AC_DEFINE([HAVE_GTK_VNC], 1, [Have gtk-vnc?])] +) +AM_CONDITIONAL([HAVE_GTK_VNC], [test "x$with_gtk_vnc" = "xyes"]) AC_ARG_WITH([spice-gtk], AS_HELP_STRING([--without-spice-gtk], [Ignore presence of spice-gtk and disable it])) -AS_IF([test "x$with_spice_gtk" != "xno"], - [PKG_CHECK_MODULES(SPICE_GTK, - [spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED], - [have_spice_gtk=yes], [have_spice_gtk=no])], - [have_spice_gtk=no]) - -AS_IF([test "x$have_spice_gtk" = "xyes"], +AS_IF([test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"], + [PKG_CHECK_EXISTS([spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED + spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED], + [with_spice_gtk=yes], [with_spice_gtk=no])]) + +AS_IF([test "x$with_spice_gtk" = "xyes"], + [PKG_CHECK_MODULES(SPICE_GTK, [spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED])] [PKG_CHECK_MODULES(SPICE_CONTROLLER, [spice-controller])] [PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol >= $SPICE_PROTOCOL_REQUIRED])] - [AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])], - [AS_IF([test "x$with_spice_gtk" = "xyes"], - [AC_MSG_ERROR([spice-gtk requested but not found]) - ]) -]) -AM_CONDITIONAL([HAVE_SPICE_GTK], [test "x$have_spice_gtk" = "xyes"]) + [AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])] +) +AM_CONDITIONAL([HAVE_SPICE_GTK], [test "x$with_spice_gtk" = "xyes"]) AC_ARG_WITH([ovirt], AS_HELP_STRING([--without-ovirt], [Ignore presence of librest and disable oVirt support])) -AS_IF([test "x$with_ovirt" != "xno"], - [PKG_CHECK_MODULES([OVIRT], [govirt-1.0 >= $GOVIRT_REQUIRED], - [have_ovirt=yes], [have_ovirt=no])], - [have_ovirt=no]) - -AS_IF([test "x$have_ovirt" = "xyes"], - [AC_DEFINE([HAVE_OVIRT], 1, [Have libgovirt?])], - [AS_IF([test "x$with_ovirt" = "xyes"], - [AC_MSG_ERROR([oVirt support requested but libgovirt not found]) - ]) -]) +AS_IF([test "x$with_ovirt" != "xno" && test "x$with_ovirt" != "xyes"], + [PKG_CHECK_EXISTS([govirt-1.0 >= $GOVIRT_REQUIRED], + [with_ovirt=yes], [with_ovirt=no])]) + +AS_IF([test "x$with_ovirt" = "xyes"], + [PKG_CHECK_MODULES([OVIRT], [govirt-1.0 >= $GOVIRT_REQUIRED])] + [AC_DEFINE([HAVE_OVIRT], 1, [Have libgovirt?])] + [SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + CFLAGS="$OVIRT_CFLAGS" + LIBS="$OVIRT_LIBS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], + [static int err = OVIRT_REST_CALL_ERROR_CANCELLED; + void *fun = rest_proxy_auth_cancel;])], + [AC_DEFINE([HAVE_OVIRT_CANCEL], 1, [Have rest_proxy_auth_cancel and OVIRT_REST_CALL_ERROR_CANCELLED?])], + []) + CFLAGS="$SAVED_CFLAGS" + LIBS="$SAVED_LIBS"] +) +AM_CONDITIONAL([HAVE_OVIRT], [test "x$with_ovirt" = "xyes"]) dnl Decide if this platform can support the SSH tunnel feature. AC_CHECK_HEADERS([sys/socket.h sys/un.h windows.h]) AC_CHECK_FUNCS([fork socketpair]) -if test "x$have_gtk_vnc" != "xyes" && test "x$have_spice_gtk" != "xyes"; then +if test "x$with_gtk_vnc" != "xyes" && test "x$with_spice_gtk" != "xyes"; then AC_MSG_ERROR([At least one of spice or vnc must be used]) +fi + +AC_ARG_WITH([osid], + AS_HELP_STRING([--with-osid=id], [Set OS ID for use in .vv files])) +if test -n "$with_osid"; then + AC_DEFINE_UNQUOTED([REMOTE_VIEWER_OS_ID], "$with_osid", [OS ID for this build]) fi AC_ARG_WITH([buildid], AS_HELP_STRING([--with-buildid=id], [Set additional build version details]), [buildid="$with_buildid"], [buildid="0"]) -AC_DEFINE_UNQUOTED([BUILDID], "$buildid", [Build version details]) -AC_SUBST([BUILDID], "$buildid") + +if test "x$buildid" != "x0"; then + AC_DEFINE_UNQUOTED([BUILDID], "-$buildid", [Build version details]) + AC_SUBST([BUILDID], "-$buildid") +else + AC_DEFINE_UNQUOTED([BUILDID], "", [Build version details]) +fi major=`echo $PACKAGE_VERSION | cut -d. -f1` minor=`echo $PACKAGE_VERSION | cut -d. -f2` @@ -234,6 +251,7 @@ AC_CONFIG_FILES([ Makefile data/Makefile + data/adwaita-icons-needed.wxi data/virt-viewer.wxs data/virt-viewer.nsis data/virt-viewer-debug.nsis diff --git a/data/Makefile.am b/data/Makefile.am index 086efca..29887b9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,6 +4,7 @@ EXTRA_DIST = \ spice-xpi-client-remote-viewer \ + adwaita-icons-needed.wxi.in \ virt-viewer.wxs.in \ virt-viewer.nsis.in \ virt-viewer-debug.nsis.in \ @@ -11,9 +12,33 @@ # this make sure those files are regenerated when they change # (in maintainer-mode) -all-local: virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis +all-local: adwaita-icons-needed.wxi virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis if OS_WIN32 + +if HAVE_LIBVIRT +HaveLibvirt = True +else +HaveLibvirt = False +endif + +if HAVE_OVIRT +HaveOVirt = True +else +HaveOVirt = False +endif + +if HAVE_SPICE_GTK +HaveSpiceGtk = True +else +HaveSpiceGtk = False +endif + +if HAVE_GTK_VNC +HaveGtkVnc = True +else +HaveGtkVnc = False +endif deps.txt: $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ @@ -21,7 +46,13 @@ virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt $(AM_V_GEN)DESTDIR=`mktemp -d` && \ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ - makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \ + makensis -NOCD \ + -DDESTDIR=$$DESTDIR \ + -DHaveSpiceGtk=$(HaveSpiceGtk) \ + -DHaveGtkVnc=$(HaveGtkVnc) \ + -DHaveLibvirt=$(HaveLibvirt) \ + -DHaveOVirt=$(HaveOVirt) \ + $< >/dev/null && \ rm -rf $$DESTDIR virt-viewer-debug-$(VERSION).exe: virt-viewer-debug.nsis @@ -38,6 +69,10 @@ --directory-ref=INSTALLDIR > virt-viewer-files.wxs && \ MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \ -D DESTDIR=$$DESTDIR$(prefix) \ + -D HaveSpiceGtk=$(HaveSpiceGtk) \ + -D HaveGtkVnc=$(HaveGtkVnc) \ + -D HaveLibvirt=$(HaveLibvirt) \ + -D HaveOVirt=$(HaveOVirt) \ --arch $(WIXL_ARCH) \ -o $@ \ $< virt-viewer-files.wxs && \ diff --git a/data/Makefile.in b/data/Makefile.in index 9b04244..69b75b3 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -87,9 +97,6 @@ @OS_WIN32_FALSE@am__append_2 = $(mime_DATA) $(desktop_DATA) @OS_WIN32_FALSE@am__append_3 = $(MIMEFILES) $(DESKTOPFILES) subdir = data -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/virt-viewer.wxs.in $(srcdir)/virt-viewer.nsis.in \ - $(srcdir)/virt-viewer-debug.nsis.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -98,10 +105,11 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = virt-viewer.wxs virt-viewer.nsis \ - virt-viewer-debug.nsis +CONFIG_CLEAN_FILES = adwaita-icons-needed.wxi virt-viewer.wxs \ + virt-viewer.nsis virt-viewer-debug.nsis CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -152,6 +160,10 @@ am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" DATA = $(desktop_DATA) $(mime_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(srcdir)/adwaita-icons-needed.wxi.in \ + $(srcdir)/virt-viewer-debug.nsis.in \ + $(srcdir)/virt-viewer.nsis.in $(srcdir)/virt-viewer.wxs.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -233,6 +245,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -341,9 +354,18 @@ NULL = CLEANFILES = $(am__append_1) $(am__append_2) MANUFACTURER = Virt Manager Project -EXTRA_DIST = spice-xpi-client-remote-viewer virt-viewer.wxs.in \ +EXTRA_DIST = spice-xpi-client-remote-viewer \ + adwaita-icons-needed.wxi.in virt-viewer.wxs.in \ virt-viewer.nsis.in virt-viewer-debug.nsis.in $(NULL) \ $(am__append_3) +@HAVE_LIBVIRT_FALSE@@OS_WIN32_TRUE@HaveLibvirt = False +@HAVE_LIBVIRT_TRUE@@OS_WIN32_TRUE@HaveLibvirt = True +@HAVE_OVIRT_FALSE@@OS_WIN32_TRUE@HaveOVirt = False +@HAVE_OVIRT_TRUE@@OS_WIN32_TRUE@HaveOVirt = True +@HAVE_SPICE_GTK_FALSE@@OS_WIN32_TRUE@HaveSpiceGtk = False +@HAVE_SPICE_GTK_TRUE@@OS_WIN32_TRUE@HaveSpiceGtk = True +@HAVE_GTK_VNC_FALSE@@OS_WIN32_TRUE@HaveGtkVnc = False +@HAVE_GTK_VNC_TRUE@@OS_WIN32_TRUE@HaveGtkVnc = True @OS_WIN32_FALSE@desktopdir = $(datadir)/applications @OS_WIN32_FALSE@DESKTOPFILES = remote-viewer.desktop.in @OS_WIN32_FALSE@desktop_DATA = $(DESKTOPFILES:.desktop.in=.desktop) @@ -365,7 +387,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -383,6 +404,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +adwaita-icons-needed.wxi: $(top_builddir)/config.status $(srcdir)/adwaita-icons-needed.wxi.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ virt-viewer.wxs: $(top_builddir)/config.status $(srcdir)/virt-viewer.wxs.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ virt-viewer.nsis: $(top_builddir)/config.status $(srcdir)/virt-viewer.nsis.in @@ -599,10 +622,12 @@ uninstall-am uninstall-desktopDATA uninstall-hook \ uninstall-mimeDATA +.PRECIOUS: Makefile + # this make sure those files are regenerated when they change # (in maintainer-mode) -all-local: virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis +all-local: adwaita-icons-needed.wxi virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis @OS_WIN32_TRUE@deps.txt: @OS_WIN32_TRUE@ $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ @@ -610,7 +635,13 @@ @OS_WIN32_TRUE@virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \ @OS_WIN32_TRUE@ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ -@OS_WIN32_TRUE@ makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \ +@OS_WIN32_TRUE@ makensis -NOCD \ +@OS_WIN32_TRUE@ -DDESTDIR=$$DESTDIR \ +@OS_WIN32_TRUE@ -DHaveSpiceGtk=$(HaveSpiceGtk) \ +@OS_WIN32_TRUE@ -DHaveGtkVnc=$(HaveGtkVnc) \ +@OS_WIN32_TRUE@ -DHaveLibvirt=$(HaveLibvirt) \ +@OS_WIN32_TRUE@ -DHaveOVirt=$(HaveOVirt) \ +@OS_WIN32_TRUE@ $< >/dev/null && \ @OS_WIN32_TRUE@ rm -rf $$DESTDIR @OS_WIN32_TRUE@virt-viewer-debug-$(VERSION).exe: virt-viewer-debug.nsis @@ -627,6 +658,10 @@ @OS_WIN32_TRUE@ --directory-ref=INSTALLDIR > virt-viewer-files.wxs && \ @OS_WIN32_TRUE@ MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \ @OS_WIN32_TRUE@ -D DESTDIR=$$DESTDIR$(prefix) \ +@OS_WIN32_TRUE@ -D HaveSpiceGtk=$(HaveSpiceGtk) \ +@OS_WIN32_TRUE@ -D HaveGtkVnc=$(HaveGtkVnc) \ +@OS_WIN32_TRUE@ -D HaveLibvirt=$(HaveLibvirt) \ +@OS_WIN32_TRUE@ -D HaveOVirt=$(HaveOVirt) \ @OS_WIN32_TRUE@ --arch $(WIXL_ARCH) \ @OS_WIN32_TRUE@ -o $@ \ @OS_WIN32_TRUE@ $< virt-viewer-files.wxs && \ diff --git a/data/adwaita-icons-needed.wxi.in b/data/adwaita-icons-needed.wxi.in new file mode 100644 index 0000000..417a811 --- /dev/null +++ b/data/adwaita-icons-needed.wxi.in @@ -0,0 +1,807 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in old file mode 100644 new file mode 100755 index 103de16..c8e8a90 100755 --- a/data/virt-viewer.nsis.in +++ b/data/virt-viewer.nsis.in @@ -65,149 +65,375 @@ File "deps.txt" SetOutPath "$INSTDIR\bin" - File "@prefix@/bin/gst-discoverer-0.10.exe" - File "@prefix@/bin/gst-feedback.exe" - File "@prefix@/bin/gst-inspect-0.10.exe" - File "@prefix@/bin/gst-inspect.exe" - File "@prefix@/bin/gst-launch-0.10.exe" - File "@prefix@/bin/gst-launch.exe" - File "@prefix@/bin/gst-typefind-0.10.exe" - File "@prefix@/bin/gst-typefind.exe" - File "@prefix@/bin/gst-xmlinspect-0.10.exe" - File "@prefix@/bin/gst-xmlinspect.exe" - File "@prefix@/bin/gst-xmllaunch-0.10.exe" - File "@prefix@/bin/gst-xmllaunch.exe" + !if ${HaveSpiceGtk} == True + # gstreamer1 + File "@prefix@/bin/gst-inspect-1.0.exe" + File "@prefix@/bin/gst-launch-1.0.exe" + File "@prefix@/bin/gst-typefind-1.0.exe" + File "@prefix@/bin/libgstbase-1.0-0.dll" + File "@prefix@/bin/libgstcontroller-1.0-0.dll" + File "@prefix@/bin/libgstreamer-1.0-0.dll" + # gstreamer1-plugins-base + File "@prefix@/bin/libgstapp-1.0-0.dll" + File "@prefix@/bin/libgstaudio-1.0-0.dll" + File "@prefix@/bin/libgstfft-1.0-0.dll" + File "@prefix@/bin/libgstpbutils-1.0-0.dll" + File "@prefix@/bin/libgsttag-1.0-0.dll" + + File "@prefix@/bin/libusb-1.0.dll" + File "@prefix@/bin/libusbredirhost-1.dll" + File "@prefix@/bin/libusbredirparser-1.dll" + + File "@prefix@/bin/libcelt051-0.dll" + File "@prefix@/bin/libopus-0.dll" + File "@prefix@/bin/liborc-0.4-0.dll" + File "@prefix@/bin/liborc-test-0.4-0.dll" + + File "@prefix@/bin/libspice-client-glib-2.0-8.dll" + File "@prefix@/bin/libspice-controller-0.dll" + File "@prefix@/bin/libspice-client-gtk-3.0-4.dll" + !endif + File "@prefix@/bin/libatk-1.0-0.dll" + File "@prefix@/bin/libbz2-1.dll" File "@prefix@/bin/libcairo-2.dll" - File "@prefix@/bin/libcelt051-0.dll" + File "@prefix@/bin/libcairo-gobject-2.dll" + File "@prefix@/bin/libepoxy-0.dll" File "@prefix@/bin/libcrypto-10.dll" File "@prefix@/bin/libexpat-1.dll" File "@prefix@/bin/libffi-6.dll" File "@prefix@/bin/libfontconfig-1.dll" File "@prefix@/bin/libfreetype-6.dll" - File "@prefix@/bin/libgdk-win32-2.0-0.dll" - File "@prefix@/bin/libgdk-win32-2.0-0.dll" - File "@prefix@/bin/libgdk_pixbuf-2.0-0.dll" + File "@prefix@/bin/libgdk-3-0.dll" File "@prefix@/bin/libgdk_pixbuf-2.0-0.dll" File "@prefix@/bin/libgio-2.0-0.dll" File "@prefix@/bin/libglib-2.0-0.dll" File "@prefix@/bin/libgmodule-2.0-0.dll" File "@prefix@/bin/libgobject-2.0-0.dll" - File "@prefix@/bin/libgstapp-0.10-0.dll" - File "@prefix@/bin/libgstaudio-0.10-0.dll" - File "@prefix@/bin/libgstbase-0.10-0.dll" - File "@prefix@/bin/libgstcontroller-0.10-0.dll" - File "@prefix@/bin/libgstfft-0.10-0.dll" - File "@prefix@/bin/libgstinterfaces-0.10-0.dll" - File "@prefix@/bin/libgstpbutils-0.10-0.dll" - File "@prefix@/bin/libgstreamer-0.10-0.dll" - File "@prefix@/bin/libgstvideo-0.10-0.dll" File "@prefix@/bin/libgthread-2.0-0.dll" - File "@prefix@/bin/libgtk-win32-2.0-0.dll" + File "@prefix@/bin/libgtk-3-0.dll" File "@prefix@/bin/iconv.dll" File "@prefix@/bin/libintl-8.dll" File "@prefix@/bin/libjpeg-62.dll" - File "@prefix@/bin/liborc-0.4-0.dll" - File "@prefix@/bin/liborc-test-0.4-0.dll" File "@prefix@/bin/libpango-1.0-0.dll" File "@prefix@/bin/libpangocairo-1.0-0.dll" File "@prefix@/bin/libpangoft2-1.0-0.dll" File "@prefix@/bin/libpangowin32-1.0-0.dll" File "@prefix@/bin/libpixman-1-0.dll" - File "@prefix@/bin/libpng15-15.dll" - File "@prefix@/bin/libspice-client-glib-2.0-8.dll" - File "@prefix@/bin/libspice-client-gtk-2.0-4.dll" - File "@prefix@/bin/libspice-controller-0.dll" + File "@prefix@/bin/libpng16-16.dll" File "@prefix@/bin/libssl-10.dll" - File "@prefix@/bin/libtasn1-3.dll" - File "@prefix@/bin/libusb-1.0.dll" - File "@prefix@/bin/libusbredirhost-1.dll" - File "@prefix@/bin/libusbredirparser-1.dll" + File "@prefix@/bin/libtasn1-6.dll" File "@prefix@/bin/libxml2-2.dll" File "@prefix@/bin/libp11-kit-0.dll" - File "@prefix@/bin/libssh2-1.dll" - File "@prefix@/bin/libcurl-4.dll" - File "@prefix@/bin/libportablexdr-0.dll" - File "@prefix@/bin/libidn-11.dll" File "@prefix@/bin/libssp-0.dll" - File "@prefix@/bin/libvirt-0.dll" - File "@prefix@/bin/libvirt-qemu-0.dll" - File "@prefix@/bin/virsh.exe" - File "@prefix@/bin/virt-pki-validate" - File "@prefix@/bin/virt-xml-validate" + File "@prefix@/bin/libwinpthread-1.dll" + !if ${HaveLibvirt} == True + File "@prefix@/bin/libssh2-1.dll" + File "@prefix@/bin/libcurl-4.dll" + File "@prefix@/bin/libportablexdr-0.dll" + File "@prefix@/bin/libidn-11.dll" + File "@prefix@/bin/libvirt-0.dll" + File "@prefix@/bin/libvirt-qemu-0.dll" + File "@prefix@/bin/libvirt-lxc-0.dll" + File "@prefix@/bin/virsh.exe" + File "@prefix@/bin/virt-pki-validate" + File "@prefix@/bin/virt-xml-validate" + !endif #gtkvnc - File "@prefix@/bin/libgnutls-26.dll" - File "@prefix@/bin/libgpg-error-0.dll" - File "@prefix@/bin/libgcrypt-11.dll" - File "@prefix@/bin/libgvnc-1.0-0.dll" - File "@prefix@/bin/libgtk-vnc-1.0-0.dll" - - File "@prefix@/bin/pango-querymodules.exe" + !if ${HaveGtkVnc} == True + File "@prefix@/bin/libgpg-error-0.dll" + File "@prefix@/bin/libgcrypt-20.dll" + File "@prefix@/bin/libgvnc-1.0-0.dll" + File "@prefix@/bin/libgtk-vnc-2.0-0.dll" + !endif + + File "@prefix@/bin/libgnutls-30.dll" + File "@prefix@/bin/libgmp-10.dll" + File "@prefix@/bin/libhogweed-4-1.dll" + File "@prefix@/bin/libnettle-6-1.dll" + File /nonfatal "@prefix@/bin/libgcc_s_sjlj-1.dll" + File /nonfatal "@prefix@/bin/libgcc_s_seh-1.dll" + + #libgovirt (and its dependencies) + !if ${HaveOVirt} == True + File "@prefix@/bin/libgovirt-2.dll" + File "@prefix@/bin/librest-0.7-0.dll" + File "@prefix@/bin/librest-extras-0.7-0.dll" + File "@prefix@/bin/libsoup-2.4-1.dll" + File "@prefix@/bin/libsqlite3-0.dll" + File "@prefix@/bin/libsoup-gnome-2.4-1.dll" + !endif + File /oname=remote-viewer.com "${DESTDIR}@prefix@/bin/windows-cmdline-wrapper.exe" File "${DESTDIR}@prefix@/bin/remote-viewer.exe" - File "${DESTDIR}@prefix@/bin/virt-viewer.exe" + !if ${HaveLibvirt} == True + File "${DESTDIR}@prefix@/bin/virt-viewer.exe" + !endif File "@prefix@/bin/libreadline6.dll" File "@prefix@/bin/zlib1.dll" SetOutPath "$INSTDIR\etc" File /r "@prefix@/etc/fonts" - File /r "@prefix@/etc/gtk-2.0" + File /r "@prefix@/etc/gtk-3.0" File /r "@prefix@/etc/libvirt" - CreateDirectory "$INSTDIR\etc\pango" - - CreateDirectory "$INSTDIR\etc\gtk-2.0" + + CreateDirectory "$INSTDIR\etc\gtk-3.0" SetOutPath "$INSTDIR\lib" File /r "@prefix@/lib/gdk-pixbuf-2.0" - File /r "@prefix@/lib/gtk-2.0" - File /r "@prefix@/lib/pango" - - SetOutPath "$INSTDIR\lib\gstreamer-0.10" - File "@prefix@/lib/gstreamer-0.10/libgstapp.dll" - File "@prefix@/lib/gstreamer-0.10/libgstaudioconvert.dll" - File "@prefix@/lib/gstreamer-0.10/libgstaudiorate.dll" - File "@prefix@/lib/gstreamer-0.10/libgstaudioresample.dll" - File "@prefix@/lib/gstreamer-0.10/libgstaudiotestsrc.dll" - File "@prefix@/lib/gstreamer-0.10/libgstautodetect.dll" - File "@prefix@/lib/gstreamer-0.10/libgstcoreelements.dll" - File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsink.dll" - File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsrc.dll" + File /r "@prefix@/lib/gtk-3.0" + + !if ${HaveSpiceGtk} == True + SetOutPath "$INSTDIR\lib\gstreamer-1.0" + # gstreamer1 + File "@prefix@/lib/gstreamer-1.0/libgstcoreelements.dll" + # gstreamer1-plugins-base + File "@prefix@/lib/gstreamer-1.0/libgstapp.dll" + File "@prefix@/lib/gstreamer-1.0/libgstaudioconvert.dll" + File "@prefix@/lib/gstreamer-1.0/libgstaudiorate.dll" + File "@prefix@/lib/gstreamer-1.0/libgstaudioresample.dll" + # gstreamer1-plugins-good + File "@prefix@/lib/gstreamer-1.0/libgstautodetect.dll" + File "@prefix@/lib/gstreamer-1.0/libgstdirectsoundsink.dll" + # gstreamer1-plugins-bad + File "@prefix@/lib/gstreamer-1.0/libgstdirectsoundsrc.dll" + !endif + + !if ${HaveOVirt} == True + SetOutPath "$INSTDIR\lib\gio\modules" + File "@prefix@/lib/gio/modules/libgiognutls.dll" + !endif SetOutPath "$INSTDIR\share" - File /r "@prefix@/share/libvirt" + !if ${HaveLibvirt} == True + File /r "@prefix@/share/libvirt" + !endif + File /r "@prefix@/share/glib-2.0" # fixme for all languages SetOutPath "$INSTDIR\share\locale\fr" - File "@prefix@/share/locale/fr/LC_MESSAGES/libvirt.*" - File "${DESTDIR}@prefix@/share/locale/fr/LC_MESSAGES/virt-viewer.*" - + !if ${HaveLibvirt} == True + File "@prefix@/share/locale/fr/LC_MESSAGES/libvirt.*" + File "${DESTDIR}@prefix@/share/locale/fr/LC_MESSAGES/virt-viewer.*" + !endif + + # fixme: are the UI files shared between virt-viewer and remote-viewer? SetOutPath "$INSTDIR\share\virt-viewer\ui" File "${DESTDIR}@prefix@/share/virt-viewer/ui/*.xml" - SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0" - File "@prefix@/share/themes/MS-Windows/gtk-2.0/gtkrc" - - SetOutPath "$INSTDIR\etc\gtk-2.0" - FileOpen $0 gtkrc w - FileWrite $0 "gtk-theme-name = $\"MS-Windows$\" $\n" - FileWrite $0 "gtk-icon-theme-name = $\"hicolor$\" $\n" - FileClose $0 - SetOutPath "$INSTDIR\share\icons\hicolor" File "/usr/share/icons/hicolor/index.theme" SetOutPath "$INSTDIR\share\icons\hicolor\16x16\apps" File "${DESTDIR}@prefix@/share/icons/hicolor/16x16/apps/virt-viewer.png" - File "/usr/share/icons/gnome/16x16/apps/preferences-desktop-keyboard-shortcuts.png" + File "/usr/share/icons/Adwaita/16x16/apps/preferences-desktop-keyboard-shortcuts.png" + SetOutPath "$INSTDIR\share\icons\hicolor\24x24\apps" + File "${DESTDIR}@prefix@/share/icons/hicolor/24x24/apps/virt-viewer.png" + SetOutPath "$INSTDIR\share\icons\hicolor\24x24\devices" + File "${DESTDIR}@prefix@/share/icons/hicolor/24x24/devices/virt-viewer-usb.png" SetOutPath "$INSTDIR\share\icons\hicolor\32x32\apps" File "${DESTDIR}@prefix@/share/icons/hicolor/32x32/apps/virt-viewer.png" SetOutPath "$INSTDIR\share\icons\hicolor\48x48\apps" File "${DESTDIR}@prefix@/share/icons/hicolor/48x48/apps/virt-viewer.png" + CreateDirectory "$INSTDIR\share\icons\Adwaita" + SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places" + File "/usr/share/icons/Adwaita/16x16/places/folder-documents-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-download-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-music-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-pictures-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-publicshare-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-remote-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-saved-search-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-templates-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/folder-videos-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/network-server-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/network-workgroup-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/start-here-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/user-bookmarks-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\places" + File "/usr/share/icons/Adwaita/24x24/places/folder-documents-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-download-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-music-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-pictures-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-publicshare-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-remote-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-saved-search-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-templates-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/folder-videos-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/network-server-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/network-workgroup-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/start-here-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/user-bookmarks-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/user-desktop-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/user-home-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/places/user-trash-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\places" + File "/usr/share/icons/Adwaita/32x32/places/folder-documents-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-download-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-music-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-pictures-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-publicshare-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-remote-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-saved-search-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-templates-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/folder-videos-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/network-server-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/network-workgroup-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/start-here-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/user-bookmarks-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/user-desktop-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/user-home-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/places/user-trash-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\places" + File "/usr/share/icons/Adwaita/48x48/places/folder-documents-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-download-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-music-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-pictures-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-publicshare-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-remote-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-saved-search-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-templates-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/folder-videos-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/network-server-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/network-workgroup-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/start-here-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/user-bookmarks-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/user-desktop-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/user-home-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/places/user-trash-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\places" + File "/usr/share/icons/Adwaita/64x64/places/folder-documents-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-download-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-music-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-pictures-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-publicshare-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-remote-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-saved-search-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-templates-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/folder-videos-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/network-server-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/network-workgroup-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/start-here-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/user-bookmarks-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/user-desktop-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/user-home-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/places/user-trash-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\places" + File "/usr/share/icons/Adwaita/96x96/places/folder-documents-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-download-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-music-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-pictures-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-publicshare-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-remote-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-saved-search-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-templates-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/folder-videos-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/network-server-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/network-workgroup-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/start-here-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/user-bookmarks-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/user-desktop-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/user-home-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/places/user-trash-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\devices" + File "/usr/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/devices/drive-optical-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/devices/drive-removable-media-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\devices" + File "/usr/share/icons/Adwaita/24x24/devices/drive-harddisk-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/devices/drive-optical-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/devices/drive-removable-media-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\devices" + File "/usr/share/icons/Adwaita/32x32/devices/drive-harddisk-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/devices/drive-optical-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/devices/drive-removable-media-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\devices" + File "/usr/share/icons/Adwaita/48x48/devices/drive-harddisk-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/devices/drive-optical-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/devices/drive-removable-media-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\devices" + File "/usr/share/icons/Adwaita/64x64/devices/drive-harddisk-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/devices/drive-optical-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/devices/drive-removable-media-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\devices" + File "/usr/share/icons/Adwaita/96x96/devices/drive-harddisk-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/devices/drive-optical-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/devices/drive-removable-media-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\status" + File "/usr/share/icons/Adwaita/16x16/status/checkbox-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/status/checkbox-checked-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\status" + File "/usr/share/icons/Adwaita/24x24/status/checkbox-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/status/checkbox-checked-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\status" + File "/usr/share/icons/Adwaita/32x32/status/checkbox-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/status/checkbox-checked-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\status" + File "/usr/share/icons/Adwaita/48x48/status/checkbox-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/status/checkbox-checked-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\status" + File "/usr/share/icons/Adwaita/64x64/status/checkbox-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/64x64/status/checkbox-checked-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\status" + File "/usr/share/icons/Adwaita/96x96/status/checkbox-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/96x96/status/checkbox-checked-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions" + File "/usr/share/icons/Adwaita/16x16/actions/edit-clear-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/16x16/actions/view-restore.png" + File "/usr/share/icons/Adwaita/16x16/actions/window-close.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\actions" + File "/usr/share/icons/Adwaita/24x24/actions/edit-clear-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/24x24/actions/view-restore.png" + File "/usr/share/icons/Adwaita/24x24/actions/window-close.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\actions" + File "/usr/share/icons/Adwaita/32x32/actions/edit-clear-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/32x32/actions/view-restore.png" + File "/usr/share/icons/Adwaita/32x32/actions/window-close.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\actions" + File "/usr/share/icons/Adwaita/48x48/actions/edit-clear-symbolic.symbolic.png" + File "/usr/share/icons/Adwaita/48x48/actions/view-restore.png" + File "/usr/share/icons/Adwaita/48x48/actions/window-close.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\actions" + File "/usr/share/icons/Adwaita/64x64/actions/edit-clear-symbolic.symbolic.png" + + SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\actions" + File "/usr/share/icons/Adwaita/96x96/actions/edit-clear-symbolic.symbolic.png" + ReadEnvStr $0 COMSPEC SetOutPath "$INSTDIR" - nsExec::ExecToLog '$0 /C bin\pango-querymodules.exe > etc\pango\pango.modules' # make virt-viewer the default spice-x client WriteRegStr HKCU "Software\spice-space.org\spicex" "client" "$INSTDIR\bin\remote-viewer.exe --spice-controller" @@ -232,108 +458,137 @@ DeleteRegKey HKCU "${REG_UNINSTALL}" DeleteRegKey HKCU "${REG_IEPOLICY}" - RMDir /r "$INSTDIR\share" - RMDir /r "$INSTDIR\lib\pango" - RMDir /r "$INSTDIR\lib\gtk-2.0" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstautodetect.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiotestsrc.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioresample.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiorate.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll" - RMDir "$INSTDIR\lib\gstreamer-0.10" + RMDir /r "$INSTDIR\lib\gtk-3.0" + + !if ${HaveSpiceGtk} == True + # gstreamer1 + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstcoreelements.dll" + # gstreamer1-plugins-base + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstapp.dll" + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudioconvert.dll" + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudiorate.dll" + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudioresample.dll" + # gstreamer1-plugins-good + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstautodetect.dll" + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstdirectsoundsink.dll" + # gstreamer1-plugins-bad + Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstdirectsoundsrc.dll" + RMDir "$INSTDIR\lib\gstreamer-1.0" + !endif RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0" - RMDir /r "$INSTDIR\etc\pango" - RMDir /r "$INSTDIR\etc\gtk-2.0" + RMDir /r "$INSTDIR\etc\gtk-3.0" RMDir /r "$INSTDIR\etc\fonts" + !if {HaveLibvirt} == True + RMDir /r "$INSTDIR\etc\libvirt" + !endif Delete /rebootok "$INSTDIR\bin\remote-viewer.com" Delete /rebootok "$INSTDIR\bin\remote-viewer.exe" - Delete /rebootok "$INSTDIR\bin\virt-viewer.exe" - Delete /rebootok "$INSTDIR\bin\virsh.exe" - Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe" - Delete /rebootok "$INSTDIR\bin\virt-pki-validate" - Delete /rebootok "$INSTDIR\bin\virt-xml-validate" Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll" Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\gst-xmllaunch.exe" - Delete /rebootok "$INSTDIR\bin\gst-xmllaunch-0.10.exe" - Delete /rebootok "$INSTDIR\bin\gst-xmlinspect.exe" - Delete /rebootok "$INSTDIR\bin\gst-xmlinspect-0.10.exe" - Delete /rebootok "$INSTDIR\bin\gst-typefind.exe" - Delete /rebootok "$INSTDIR\bin\gst-typefind-0.10.exe" - Delete /rebootok "$INSTDIR\bin\gst-launch.exe" - Delete /rebootok "$INSTDIR\bin\gst-launch-0.10.exe" - Delete /rebootok "$INSTDIR\bin\gst-inspect.exe" - Delete /rebootok "$INSTDIR\bin\gst-inspect-0.10.exe" - Delete /rebootok "$INSTDIR\bin\gst-feedback.exe" - Delete /rebootok "$INSTDIR\bin\gst-discoverer-0.10.exe" + Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll" + !if ${HaveSpiceGtk} == True + # gstreamer1 + Delete /rebootok "$INSTDIR\bin\gst-inspect-1.0.exe" + Delete /rebootok "$INSTDIR\bin\gst-launch-1.0.exe" + Delete /rebootok "$INSTDIR\bin\gst-typefind-1.0.exe" + Delete /rebootok "$INSTDIR\bin\libgstbase-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgstcontroller-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgstreamer-1.0-0.dll" + # gstreamer1-plugins-base + Delete /rebootok "$INSTDIR\bin\libgstapp-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgstaudio-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgstfft-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgstpbutils-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgsttag-1.0-0.dll" + + Delete /rebootok "$INSTDIR\bin\libusb-1.0.dll" + Delete /rebootok "$INSTDIR\bin\libusbredirhost-1.dll" + Delete /rebootok "$INSTDIR\bin\libusbredirparser-1.dll" + + Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll" + Delete /rebootok "$INSTDIR\bin\libopus-0.dll" + Delete /rebootok "$INSTDIR\bin\liborc-test-0.4-0.dll" + Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll" + + Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll" + Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll" + Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-4.dll" + !endif Delete /rebootok "$INSTDIR\bin\zlib1.dll" Delete /rebootok "$INSTDIR\bin\libreadline6.dll" Delete /rebootok "$INSTDIR\bin\libffi-6.dll" Delete /rebootok "$INSTDIR\bin\libp11-kit-0.dll" Delete /rebootok "$INSTDIR\bin\libxml2-2.dll" - Delete /rebootok "$INSTDIR\bin\libtasn1-3.dll" + Delete /rebootok "$INSTDIR\bin\libtasn1-6.dll" Delete /rebootok "$INSTDIR\bin\libssl-10.dll" - Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll" - Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll" - Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll" - Delete /rebootok "$INSTDIR\bin\libpng15-15.dll" + Delete /rebootok "$INSTDIR\bin\libpng16-16.dll" Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll" Delete /rebootok "$INSTDIR\bin\libpangowin32-1.0-0.dll" Delete /rebootok "$INSTDIR\bin\libpangocairo-1.0-0.dll" Delete /rebootok "$INSTDIR\bin\libpango-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\liborc-test-0.4-0.dll" - Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll" Delete /rebootok "$INSTDIR\bin\libjpeg-62.dll" Delete /rebootok "$INSTDIR\bin\libintl-8.dll" - Delete /rebootok "$INSTDIR\bin\libusb-1.0.dll" - Delete /rebootok "$INSTDIR\bin\libusbredirhost-1.dll" - Delete /rebootok "$INSTDIR\bin\libusbredirparser-1.dll" - Delete /rebootok "$INSTDIR\bin\libvirt-0.dll" - Delete /rebootok "$INSTDIR\bin\libcurl-4.dll" - Delete /rebootok "$INSTDIR\bin\libidn-11.dll" - Delete /rebootok "$INSTDIR\bin\libssh2-1.dll" - Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll" - Delete /rebootok "$INSTDIR\bin\libportablexdr-0.dll" - Delete /rebootok "$INSTDIR\bin\libvirt-qemu-0.dll" + !if ${HaveLibvirt} == True + Delete /rebootok "$INSTDIR\bin\libvirt-0.dll" + Delete /rebootok "$INSTDIR\bin\libwinpthread-1.dll" + Delete /rebootok "$INSTDIR\bin\libcurl-4.dll" + Delete /rebootok "$INSTDIR\bin\libidn-11.dll" + Delete /rebootok "$INSTDIR\bin\libssh2-1.dll" + Delete /rebootok "$INSTDIR\bin\libportablexdr-0.dll" + Delete /rebootok "$INSTDIR\bin\libvirt-qemu-0.dll" + Delete /rebootok "$INSTDIR\bin\libvirt-lxc-0.dll" + Delete /rebootok "$INSTDIR\bin\virsh.exe" + Delete /rebootok "$INSTDIR\bin\virt-pki-validate" + Delete /rebootok "$INSTDIR\bin\virt-xml-validate" + Delete /rebootok "$INSTDIR\bin\virt-viewer.exe" + !endif + Delete /rebootok "$INSTDIR\bin\libgmp-10.dll" + Delete /rebootok "$INSTDIR\bin\libhogweed-4-1.dll" + Delete /rebootok "$INSTDIR\bin\libnettle-6-1.dll" + Delete /rebootok "$INSTDIR\bin\libgcc_s_sjlj-1.dll" + Delete /rebootok "$INSTDIR\bin\libgcc_s_seh-1.dll" + !if ${HaveGtkVnc} == True + Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll" + Delete /rebootok "$INSTDIR\bin\libgcrypt-20.dll" + Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll" + !endif Delete /rebootok "$INSTDIR\bin\libssp-0.dll" Delete /rebootok "$INSTDIR\bin\iconv.dll" - Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll" Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstvideo-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstreamer-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstpbutils-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstinterfaces-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstfft-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstcontroller-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstbase-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstaudio-0.10-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstapp-0.10-0.dll" Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgnutls-26.dll" - Delete /rebootok "$INSTDIR\bin\libgcrypt-11.dll" + Delete /rebootok "$INSTDIR\bin\libgnutls-30.dll" Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll" Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll" Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll" Delete /rebootok "$INSTDIR\bin\libfreetype-6.dll" Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll" Delete /rebootok "$INSTDIR\bin\libexpat-1.dll" Delete /rebootok "$INSTDIR\bin\libcrypto-10.dll" - Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll" Delete /rebootok "$INSTDIR\bin\libcairo-2.dll" + Delete /rebootok "$INSTDIR\bin\libcairo-gobject-2.dll" + Delete /rebootok "$INSTDIR\bin\libepoxy-0.dll" + Delete /rebootok "$INSTDIR\bin\libbz2-1.dll" Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll" + !if ${HaveOVirt} == True + Delete /rebootok "$INSTDIR\bin\libgovirt-2.dll" + Delete /rebootok "$INSTDIR\bin\librest-0.7-0.dll" + Delete /rebootok "$INSTDIR\bin\librest-extras-0.7-0.dll" + Delete /rebootok "$INSTDIR\bin\libsoup-2.4-1.dll" + Delete /rebootok "$INSTDIR\bin\libsqlite3-0.dll" + Delete /rebootok "$INSTDIR\bin\libsoup-gnome-2.4-1.dll" + !endif + + !if ${HaveOVirt} == True + Delete /rebootok "$INSTDIR\lib\gio\modules\libgiognutls.dll" + RMDir /r "$INSTDIR\lib\gio" + !endif + RMDir "$INSTDIR\bin" RMDir "$INSTDIR\lib" diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in index 438f341..b7ea1e0 100644 --- a/data/virt-viewer.wxs.in +++ b/data/virt-viewer.wxs.in @@ -16,9 +16,20 @@ - - - + + + + + + + + + + + + + + - + @@ -56,7 +67,7 @@ - + @@ -65,7 +76,7 @@ - + @@ -90,7 +101,7 @@ + Source="/usr/share/icons/Adwaita/16x16/apps/preferences-desktop-keyboard-shortcuts.png"/> @@ -112,9 +123,20 @@ - - - + + + + + + + + + + + + + + diff --git a/icons/16x16/Makefile.in b/icons/16x16/Makefile.in index 56dced4..7061f52 100644 --- a/icons/16x16/Makefile.in +++ b/icons/16x16/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/16x16 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -141,6 +151,7 @@ am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -222,6 +233,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -346,7 +358,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/16x16/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu icons/16x16/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -545,6 +556,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff --git a/icons/22x22/Makefile.in b/icons/22x22/Makefile.in index 96b477b..349311b 100644 --- a/icons/22x22/Makefile.in +++ b/icons/22x22/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/22x22 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -141,6 +151,7 @@ am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -222,6 +233,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -346,7 +358,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/22x22/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu icons/22x22/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -545,6 +556,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am index 50ba421..f2b6388 100644 --- a/icons/24x24/Makefile.am +++ b/icons/24x24/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST += $(apps_icon_DATA) devices_icondir = $(datadir)/icons/hicolor/$(size)/devices/ -devices_icon_DATA = virt-viewer-usb.svg +devices_icon_DATA = virt-viewer-usb.png virt-viewer-usb.svg EXTRA_DIST += $(devices_icon_DATA) -include $(top_srcdir)/git.mk diff --git a/icons/24x24/Makefile.in b/icons/24x24/Makefile.in index e87daa1..7f7be38 100644 --- a/icons/24x24/Makefile.in +++ b/icons/24x24/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/24x24 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -142,6 +152,7 @@ "$(DESTDIR)$(devices_icondir)" DATA = $(apps_icon_DATA) $(devices_icon_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -223,6 +234,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -333,7 +345,7 @@ apps_icondir = $(datadir)/icons/hicolor/$(size)/apps/ apps_icon_DATA = $(PACKAGE).png devices_icondir = $(datadir)/icons/hicolor/$(size)/devices/ -devices_icon_DATA = virt-viewer-usb.svg +devices_icon_DATA = virt-viewer-usb.png virt-viewer-usb.svg all: all-am .SUFFIXES: @@ -349,7 +361,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/24x24/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu icons/24x24/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -571,6 +582,8 @@ tags-am uninstall uninstall-am uninstall-apps_iconDATA \ uninstall-devices_iconDATA +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff --git a/icons/24x24/virt-viewer-usb.png b/icons/24x24/virt-viewer-usb.png new file mode 100644 index 0000000..e23661e Binary files /dev/null and b/icons/24x24/virt-viewer-usb.png differ diff --git a/icons/256x256/Makefile.in b/icons/256x256/Makefile.in index d34d725..e913799 100644 --- a/icons/256x256/Makefile.in +++ b/icons/256x256/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/256x256 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -141,6 +151,7 @@ am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -222,6 +233,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -346,7 +358,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/256x256/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu icons/256x256/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -545,6 +556,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff --git a/icons/32x32/Makefile.in b/icons/32x32/Makefile.in index a5104d6..99f82e2 100644 --- a/icons/32x32/Makefile.in +++ b/icons/32x32/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/32x32 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -141,6 +151,7 @@ am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -222,6 +233,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -346,7 +358,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/32x32/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu icons/32x32/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -545,6 +556,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in index 8776d03..8fdd81b 100644 --- a/icons/48x48/Makefile.in +++ b/icons/48x48/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/48x48 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -141,6 +151,7 @@ am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -222,6 +233,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -346,7 +358,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/48x48/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu icons/48x48/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -545,6 +556,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff --git a/icons/Makefile.in b/icons/Makefile.in index 15eeaa8..70c5959 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -148,6 +158,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -254,6 +265,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -380,7 +392,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu icons/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -676,6 +687,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + %.ico: $(foreach s,$(ico_sizes),$(s)x$(s)/%.png) $(AM_V_GEN)$(ICOTOOL) -c -o $@ $^ diff --git a/m4/intltool.m4 b/m4/intltool.m4 index 33353ed..c25b7b1 100644 --- a/m4/intltool.m4 +++ b/m4/intltool.m4 @@ -154,31 +154,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) IT_PO_SUBDIR([po]) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index f12cfdf..a644432 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# This file is part of GNU Libtool. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool 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 General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" +with_gnu_ld=$lt_cv_prog_gnu_ld + +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,31 +715,46 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS # ### END LIBTOOL CONFIG + +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE _LT_EOF @@ -739,7 +764,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -755,8 +780,6 @@ # is reportedly fixed, but why not run on old versions too? sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_REPLACE_SHELLFNS mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,7 +1386,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1369,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1389,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1398,7 +1468,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1414,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1433,11 +1503,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1445,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1476,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1512,7 +1582,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1539,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1561,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1580,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1604,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1644,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1694,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1725,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1753,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1800,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1828,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1849,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1859,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1905,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no + else enable_dlopen=yes - else - enable_dlopen=no fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1929,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1939,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2033,8 +2112,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2044,8 +2123,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2072,8 +2151,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2085,15 +2164,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2107,12 +2186,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2136,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2154,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2164,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2190,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2225,7 +2353,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2234,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2251,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2266,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2310,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2329,8 +2510,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2342,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2351,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2368,17 +2549,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2387,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2415,7 +2596,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2428,8 +2609,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2442,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2455,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2469,8 +2650,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2488,12 +2669,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2518,26 +2700,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2555,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2570,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2580,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2594,8 +2766,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2606,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2614,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2634,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2644,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2678,11 +2870,15 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2699,12 +2895,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2714,7 +2910,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2723,58 +2919,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2785,8 +2991,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2796,11 +3002,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2808,8 +3014,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2830,24 +3036,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2865,7 +3071,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2873,8 +3079,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2883,19 +3089,29 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi + +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and @@ -2929,39 +3145,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2984,11 +3202,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3006,7 +3224,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3033,16 +3251,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3056,7 +3274,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3067,37 +3285,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE # _LT_CHECK_MAGIC_METHOD @@ -3183,13 +3438,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3216,8 +3471,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3251,10 +3505,6 @@ else lt_cv_deplibs_check_method=pass_all fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all ;; haiku*) @@ -3295,7 +3545,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3317,8 +3567,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3371,6 +3621,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3411,33 +3664,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3448,21 +3706,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3470,8 +3728,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3517,8 +3775,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3530,7 +3788,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3557,11 +3815,26 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL + + +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P # LT_LIB_M @@ -3575,11 +3848,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3598,7 +3871,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3650,7 +3923,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3683,14 +3956,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3708,21 +4011,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3762,11 +4068,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3792,7 +4098,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3812,9 +4118,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3835,7 +4141,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3862,12 +4168,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,17 +4193,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3904,8 +4215,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3921,6 +4232,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3970,7 +4286,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4011,14 +4327,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4047,7 +4363,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4055,7 +4371,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4200,17 +4516,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4221,8 +4538,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4239,6 +4556,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4309,7 +4631,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4317,11 +4639,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4337,7 +4678,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4346,9 +4687,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4372,6 +4713,12 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, @@ -4470,7 +4817,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4499,7 +4846,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4565,17 +4912,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4621,9 +4972,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4639,7 +4990,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4647,7 +4998,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4657,7 +5008,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4679,24 +5030,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4709,7 +5060,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4728,7 +5079,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4744,7 +5095,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4754,7 +5105,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4762,61 +5113,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4827,42 +5206,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4876,8 +5260,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4895,8 +5279,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4908,7 +5292,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4923,9 +5307,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4942,15 +5326,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4966,7 +5350,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4974,34 +5358,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5020,13 +5427,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5045,61 +5460,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5108,7 +5542,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5138,16 +5572,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5156,18 +5591,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5176,7 +5611,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5226,33 +5661,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5260,25 +5695,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5286,14 +5721,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5304,7 +5739,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5315,16 +5750,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5337,19 +5772,29 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; netbsd*) @@ -5366,7 +5811,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5374,27 +5819,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5405,33 +5842,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5442,24 +5899,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5469,11 +5926,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5483,10 +5940,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5535,43 +5992,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5586,17 +6043,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5613,7 +6070,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5739,10 +6196,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5782,18 +6239,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5801,8 +6258,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5810,13 +6271,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5824,14 +6285,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5873,7 +6334,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5915,35 +6376,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5979,18 +6440,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6000,6 +6473,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6018,13 +6498,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6042,64 +6530,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6109,7 +6617,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6137,57 +6645,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6196,6 +6705,34 @@ ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; dgux*) @@ -6232,18 +6769,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6255,7 +6789,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6264,11 +6798,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6278,15 +6812,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6312,13 +6846,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6329,20 +6863,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6357,22 +6891,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6381,22 +6915,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6404,8 +6938,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6414,10 +6948,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6431,59 +6965,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6497,18 +7031,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6516,10 +7050,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6577,22 +7111,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6608,9 +7137,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6628,17 +7157,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6653,21 +7182,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6713,9 +7242,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6723,7 +7252,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6740,30 +7269,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6771,11 +7300,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6784,52 +7313,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6860,10 +7389,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6890,7 +7419,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6912,12 +7441,13 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- @@ -7002,13 +7532,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7024,16 +7554,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7041,9 +7571,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7058,15 +7588,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7097,51 +7627,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7150,7 +7635,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7170,10 +7655,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7210,7 +7695,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7232,7 +7717,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7246,21 +7731,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7268,11 +7757,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7289,9 +7778,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7301,11 +7790,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7342,7 +7831,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7364,7 +7853,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7380,21 +7869,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7402,11 +7895,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7426,7 +7919,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7436,7 +7929,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7470,7 +7963,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7507,7 +8000,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7541,7 +8034,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7578,7 +8071,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7594,7 +8087,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7604,7 +8097,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7633,7 +8126,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7744,7 +8237,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7761,9 +8254,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7787,27 +8280,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7831,102 +8304,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 5d9acd8..94b0829 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 9000a05..48bc934 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 07a8602..fa04b52 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c573da9..c6b26f8 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff --git a/man/Makefile.am b/man/Makefile.am index 6ee3116..39b6019 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -10,7 +10,7 @@ virt-viewer.pod \ $(NULL) -MAINTAINERCLEANFILES = $(man_MANS) +MAINTAINERCLEANFILES = $(dist_man_MANS) %.1: %.pod $(AM_V_GEN)pod2man -c "Virtualization Support" $< > $@ diff --git a/man/Makefile.in b/man/Makefile.in index 32d5213..89c2bfd 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,8 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -88,6 +96,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -143,6 +152,7 @@ NROFF = nroff MANS = $(dist_man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -224,6 +234,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -340,7 +351,7 @@ virt-viewer.pod \ $(NULL) -MAINTAINERCLEANFILES = $(man_MANS) +MAINTAINERCLEANFILES = $(dist_man_MANS) all: all-am .SUFFIXES: @@ -356,7 +367,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu man/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -581,6 +591,8 @@ ps ps-am tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 +.PRECIOUS: Makefile + %.1: %.pod $(AM_V_GEN)pod2man -c "Virtualization Support" $< > $@ diff --git a/man/remote-viewer.1 b/man/remote-viewer.1 index 7002467..2d06288 100644 --- a/man/remote-viewer.1 +++ b/man/remote-viewer.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "REMOTE-VIEWER 1" -.TH REMOTE-VIEWER 1 "2014-07-21" "perl v5.18.2" "Virtualization Support" +.TH REMOTE-VIEWER 1 "2015-12-17" "perl v5.22.1" "Virtualization Support" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -151,8 +151,8 @@ Starting remote-viewer without \s-1URI\s0 will open a simple dialog with an entry and a list of previously successfully accessed \s-1URI.\s0 .PP -The \s-1URI\s0 can also point to a connection settings file, see \s-1FILE\s0 section -for a description of the format. +The \s-1URI\s0 can also point to a connection settings file, see the \s-1CONNECTION FILE\s0 +section for a description of the format. .SH "OPTIONS" .IX Header "OPTIONS" The following options are accepted when running \f(CW\*(C`remote\-viewer\*(C'\fR: @@ -172,10 +172,12 @@ .IX Item "-f, --full-screen" Start with the windows maximized to fullscreen. .Sp -If supported, the remote display will be reconfigured to match at best the -client physical monitor configuration on initialization, by enabling or -disabling extra monitors as necessary. This is currently implemented by the -Spice backend only. +If supported, the remote display will be reconfigured to match the physical +client monitor configuration, by enabling or disabling extra monitors as +necessary. This is currently implemented by the Spice backend only. +.Sp +To specify which client monitors are used in fullscreen mode, see the +\&\s-1CONFIGURATION\s0 section below. .IP "\-t \s-1TITLE,\s0 \-\-title \s-1TITLE\s0" 4 .IX Item "-t TITLE, --title TITLE" Set the window title to \fB\s-1TITLE\s0\fR @@ -228,13 +230,13 @@ .SH "HOTKEY" .IX Header "HOTKEY" A key binding combination is described by a series of key strings -seperated by '+' that must be pressed together in order to activate +separated by '+' that must be pressed together in order to activate the associated action. .PP It must be composed of modifiers (shift, ctrl or alt) and a non-modifier key. For example, \*(L"shift+f11\*(R". -.SH "FILE" -.IX Header "FILE" +.SH "CONNECTION FILE" +.IX Header "CONNECTION FILE" \&\fBremote-viewer\fR connection file is of \s-1INI\s0 file format, with a mandatory [virt\-viewer] group and \*(L"type\*(R" key. .SS "Example" @@ -255,10 +257,28 @@ .ie n .IP """version"" (string)" 4 .el .IP "\f(CWversion\fR (string)" 4 .IX Item "version (string)" -If remote-viewer version isn't at superior or equal to the required -version, an error is raised with the version expected. -.Sp -The version format accepted is a list of integers seperated by '.'. +If remote-viewer version number isn't greater or equal to the required +version, an error is raised with the expected version. +.Sp +The version format accepted is a list of integers separated by '.'. It can +be followed by a dash '\-' and an additional build number with the same format. +.Sp +Version comparison is done by comparing each integer from the list one by +one. If any of the component is not a number, the version comparison will fail +and consider that the 2 versions are considered to be the same. +.ie n .IP """versions"" (osid:version list)" 4 +.el .IP "\f(CWversions\fR (osid:version list)" 4 +.IX Item "versions (osid:version list)" +This is a list of osid:version couples separated by ';'. osid is an arbitrary string, version is +a version number in the same format as in the 'version' field. A given couple indicates that +remote-viewer builds matching the given 'osid' (fedora22, debian7, ...) must +be at least version 'version'. For consistency, it's recommended to use libosinfo \s-1OS\s0 shortids as +the osid. +.ie n .IP """newer\-version\-url"" (string)" 4 +.el .IP "\f(CWnewer\-version\-url\fR (string)" 4 +.IX Item "newer-version-url (string)" +If specified, this field is an \s-1URL\s0 which will be displayed to the user when a version check +fails. .ie n .IP """type"" (string, mandatory)" 4 .el .IP "\f(CWtype\fR (string, mandatory)" 4 .IX Item "type (string, mandatory)" @@ -305,7 +325,8 @@ .ie n .IP """ca"" (string)" 4 .el .IP "\f(CWca\fR (string)" 4 .IX Item "ca (string)" -\&\s-1CA\s0 certificate in \s-1PEM\s0 format (using \*(L"\en\*(R" to seperate the lines), for verification purposes. +\&\s-1CA\s0 certificate in \s-1PEM\s0 format (using \*(L"\en\*(R" to separate the lines). This will be +used to verify the \s-1SSL\s0 certificate used for \s-1SPICE TLS\s0 sessions. .ie n .IP """host\-subject"" (string)" 4 .el .IP "\f(CWhost\-subject\fR (string)" 4 .IX Item "host-subject (string)" @@ -383,6 +404,66 @@ .Sp For example, to tunnel connection through foobar host \s-1HTTP\s0 proxy on port 8080, use the value \*(L"http://foobar:8080\*(R". +.SS "oVirt Support" +.IX Subsection "oVirt Support" +The connection file can also carry some oVirt-specific options when oVirt +support is compiled in. These options are used to interact with oVirt \s-1REST API.\s0 +This is currently only used in order to show a menu allowing to change the \s-1CD\s0 +image being used by the virtual machine from remote-viewer user interface. +These options go in an optional [ovirt] group. +.ie n .IP """host"" (string, mandatory)" 4 +.el .IP "\f(CWhost\fR (string, mandatory)" 4 +.IX Item "host (string, mandatory)" +The oVirt instance to connect to. This corresponds to the hostname one would +connect to access the oVirt user or admin portal. +.ie n .IP """vm\-guid"" (string, mandatory)" 4 +.el .IP "\f(CWvm\-guid\fR (string, mandatory)" 4 +.IX Item "vm-guid (string, mandatory)" +\&\s-1GUID\s0 of the oVirt virtual machine to connect to. +.ie n .IP """jsessionid"" (string)" 4 +.el .IP "\f(CWjsessionid\fR (string)" 4 +.IX Item "jsessionid (string)" +Value to set the 'jsessionid' cookie to. Setting this authentication cookie to a valid value +will allow to interact with the oVirt \s-1REST API\s0 without being asked for credentials. +.ie n .IP """ca"" (string)" 4 +.el .IP "\f(CWca\fR (string)" 4 +.IX Item "ca (string)" +\&\s-1CA\s0 certificate in \s-1PEM\s0 format (using \*(L"\en\*(R" to separate the lines). This will be used to validate +the certificate used for the oVirt \s-1REST\s0 https session remote-viewer will establish. +.SH "CONFIGURATION" +.IX Header "CONFIGURATION" +A small number of configuration options can be controlled by editing the +settings file located in the user configuration directory: +.PP +.Vb 1 +\& /virt\-viewer/settings +.Ve +.PP +This file is a text file in \s-1INI\s0 format, with application options in the +[virt\-viewer] group and per-guest options in a group identified by the guest's +\&\s-1UUID.\s0 The application options should not be edited manually. There is also a +special [fallback] group which specifies options for all guests that don't have +an explicit group. +.PP +For each guest, the initial fullscreen monitor configuration can be specified +by using the \fBmonitor-mapping\fR key. This configuration only takes effect when +the \-f/\-\-full\-screen option is specified. +.PP +The value of this key is a list of mappings between a guest display and a +client monitor. Each mapping is separated by a semicolon character, and the +mappings have the format <\s-1GUEST\-DISPLAY\-ID\s0>:<\s-1CLIENT\-MONITOR\-ID\s0>. +.PP +For example, to map guest displays 1 and 2 to client monitors 2 and 3 for the +guest with a \s-1UUID\s0 of e4591275\-d9d3\-4a44\-a18b\-ef2fbc8ac3e2, use: +.PP +.Vb 2 +\& [e4591275\-d9d3\-4a44\-a18b\-ef2fbc8ac3e2] +\& monitor\-mapping=1:2;2:3 +.Ve +.PP +The monitor-mapping must contain ids of all displays from 1 to the last +desired display id, e.g. \*(L"monitor\-mapping=3:3\*(R" is invalid because mappings +for displays 1 and 2 are not specified. .SH "EXAMPLES" .IX Header "EXAMPLES" To connect to \s-1SPICE\s0 server on host \*(L"makai\*(R" with port 5900 @@ -395,6 +476,13 @@ .PP .Vb 1 \& remote\-viewer vnc://tsingy:5900 +.Ve +.PP +To connect to a virtual machine named \*(L"toliara\*(R" on an oVirt server at +example.org +.PP +.Vb 1 +\& remote\-viewer ovirt://[username@]example.org/toliara .Ve .SH "BUGS" .IX Header "BUGS" diff --git a/man/remote-viewer.pod b/man/remote-viewer.pod index 2c84432..57c4ec7 100644 --- a/man/remote-viewer.pod +++ b/man/remote-viewer.pod @@ -15,8 +15,8 @@ Starting remote-viewer without URI will open a simple dialog with an entry and a list of previously successfully accessed URI. -The URI can also point to a connection settings file, see FILE section -for a description of the format. +The URI can also point to a connection settings file, see the CONNECTION FILE +section for a description of the format. =head1 OPTIONS @@ -44,10 +44,12 @@ Start with the windows maximized to fullscreen. -If supported, the remote display will be reconfigured to match at best the -client physical monitor configuration on initialization, by enabling or -disabling extra monitors as necessary. This is currently implemented by the -Spice backend only. +If supported, the remote display will be reconfigured to match the physical +client monitor configuration, by enabling or disabling extra monitors as +necessary. This is currently implemented by the Spice backend only. + +To specify which client monitors are used in fullscreen mode, see the +CONFIGURATION section below. =item -t TITLE, --title TITLE @@ -107,13 +109,13 @@ =head1 HOTKEY A key binding combination is described by a series of key strings -seperated by '+' that must be pressed together in order to activate +separated by '+' that must be pressed together in order to activate the associated action. It must be composed of modifiers (shift, ctrl or alt) and a non-modifier key. For example, "shift+f11". -=head1 FILE +=head1 CONNECTION FILE B connection file is of INI file format, with a mandatory [virt-viewer] group and "type" key. @@ -136,10 +138,28 @@ =item C (string) -If remote-viewer version isn't at superior or equal to the required -version, an error is raised with the version expected. - -The version format accepted is a list of integers seperated by '.'. +If remote-viewer version number isn't greater or equal to the required +version, an error is raised with the expected version. + +The version format accepted is a list of integers separated by '.'. It can +be followed by a dash '-' and an additional build number with the same format. + +Version comparison is done by comparing each integer from the list one by +one. If any of the component is not a number, the version comparison will fail +and consider that the 2 versions are considered to be the same. + +=item C (osid:version list) + +This is a list of osid:version couples separated by ';'. osid is an arbitrary string, version is +a version number in the same format as in the 'version' field. A given couple indicates that +remote-viewer builds matching the given 'osid' (fedora22, debian7, ...) must +be at least version 'version'. For consistency, it's recommended to use libosinfo OS shortids as +the osid. + +=item C (string) + +If specified, this field is an URL which will be displayed to the user when a version check +fails. =item C (string, mandatory) @@ -186,7 +206,8 @@ =item C (string) -CA certificate in PEM format (using "\n" to seperate the lines), for verification purposes. +CA certificate in PEM format (using "\n" to separate the lines). This will be +used to verify the SSL certificate used for SPICE TLS sessions. =item C (string) @@ -267,6 +288,68 @@ =back +=head2 oVirt Support + +The connection file can also carry some oVirt-specific options when oVirt +support is compiled in. These options are used to interact with oVirt REST API. +This is currently only used in order to show a menu allowing to change the CD +image being used by the virtual machine from remote-viewer user interface. +These options go in an optional [ovirt] group. + +=over 4 + +=item C (string, mandatory) + +The oVirt instance to connect to. This corresponds to the hostname one would +connect to access the oVirt user or admin portal. + +=item C (string, mandatory) + +GUID of the oVirt virtual machine to connect to. + +=item C (string) + +Value to set the 'jsessionid' cookie to. Setting this authentication cookie to a valid value +will allow to interact with the oVirt REST API without being asked for credentials. + +=item C (string) + +CA certificate in PEM format (using "\n" to separate the lines). This will be used to validate +the certificate used for the oVirt REST https session remote-viewer will establish. + +=back + +=head1 CONFIGURATION + +A small number of configuration options can be controlled by editing the +settings file located in the user configuration directory: + + /virt-viewer/settings + +This file is a text file in INI format, with application options in the +[virt-viewer] group and per-guest options in a group identified by the guest's +UUID. The application options should not be edited manually. There is also a +special [fallback] group which specifies options for all guests that don't have +an explicit group. + +For each guest, the initial fullscreen monitor configuration can be specified +by using the B key. This configuration only takes effect when +the -f/--full-screen option is specified. + +The value of this key is a list of mappings between a guest display and a +client monitor. Each mapping is separated by a semicolon character, and the +mappings have the format :. + +For example, to map guest displays 1 and 2 to client monitors 2 and 3 for the +guest with a UUID of e4591275-d9d3-4a44-a18b-ef2fbc8ac3e2, use: + + [e4591275-d9d3-4a44-a18b-ef2fbc8ac3e2] + monitor-mapping=1:2;2:3 + +The monitor-mapping must contain ids of all displays from 1 to the last +desired display id, e.g. "monitor-mapping=3:3" is invalid because mappings +for displays 1 and 2 are not specified. + =head1 EXAMPLES To connect to SPICE server on host "makai" with port 5900 @@ -276,6 +359,11 @@ To connect to VNC server on host "tsingy" with port 5900 remote-viewer vnc://tsingy:5900 + +To connect to a virtual machine named "toliara" on an oVirt server at +example.org + + remote-viewer ovirt://[username@]example.org/toliara =head1 BUGS diff --git a/man/virt-viewer.1 b/man/virt-viewer.1 index 522c275..ae9227d 100644 --- a/man/virt-viewer.1 +++ b/man/virt-viewer.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "VIRT-VIEWER 1" -.TH VIRT-VIEWER 1 "2014-07-21" "perl v5.18.2" "Virtualization Support" +.TH VIRT-VIEWER 1 "2015-12-17" "perl v5.22.1" "Virtualization Support" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -142,7 +142,7 @@ virt\-viewer \- display the graphical console for a virtual machine .SH "SYNOPSIS" .IX Header "SYNOPSIS" -\&\fBvirt-viewer\fR [\s-1OPTIONS\s0] \*(-- DOMAIN\-NAME|ID|UUID +\&\fBvirt-viewer\fR [\s-1OPTIONS\s0] [DOMAIN\-NAME|ID|UUID] .SH "DESCRIPTION" .IX Header "DESCRIPTION" \&\fBvirt-viewer\fR is a minimal tool for displaying the graphical console @@ -193,6 +193,13 @@ .IP "\-f, \-\-full\-screen" 4 .IX Item "-f, --full-screen" Start with the window maximised to fullscreen +.Sp +If supported, the remote display will be reconfigured to match the physical +client monitor configuration, by enabling or disabling extra monitors as +necessary. This is currently implemented by the Spice backend only. +.Sp +To specify which client monitors are used in fullscreen mode, see the +\&\s-1CONFIGURATION\s0 section below. .IP "\-\-debug" 4 .IX Item "--debug" Print debugging information @@ -235,12 +242,52 @@ kiosk-quit option to \*(L"on-disconnect\*(R" value, virt-viewer will quit instead. Please note that \-\-reconnect takes precedence over this option, and will attempt to do a reconnection before it quits. +.SH "CONFIGURATION" +.IX Header "CONFIGURATION" +A small number of configuration options can be controlled by editing the +settings file located in the user configuration directory: +.PP +.Vb 1 +\& /virt\-viewer/settings +.Ve +.PP +This file is a text file in \s-1INI\s0 format, with application options in the +[virt\-viewer] group and per-guest options in a group identified by the guest's +\&\s-1UUID.\s0 The application options should not be edited manually. There is also a +special [fallback] group which specifies options for all guests that don't have +an explicit group. +.PP +For each guest, the initial fullscreen monitor configuration can be specified +by using the \fBmonitor-mapping\fR key. This configuration only takes effect when +the \-f/\-\-full\-screen option is specified. +.PP +The value of this key is a list of mappings between a guest display and a +client monitor. Each mapping is separated by a semicolon character, and the +mappings have the format <\s-1GUEST\-DISPLAY\-ID\s0>:<\s-1CLIENT\-MONITOR\-ID\s0>. +.PP +For example, to map guest displays 1 and 2 to client monitors 2 and 3 for the +guest with a \s-1UUID\s0 of e4591275\-d9d3\-4a44\-a18b\-ef2fbc8ac3e2, use: +.PP +.Vb 2 +\& [e4591275\-d9d3\-4a44\-a18b\-ef2fbc8ac3e2] +\& monitor\-mapping=1:2;2:3 +.Ve +.PP +The monitor-mapping must contain ids of all displays from 1 to the last +desired display id, e.g. \*(L"monitor\-mapping=3:3\*(R" is invalid because mappings +for displays 1 and 2 are not specified. .SH "EXAMPLES" .IX Header "EXAMPLES" To connect to the guest called 'demo' running under Xen .PP .Vb 1 \& virt\-viewer demo +.Ve +.PP +To use \s-1GUI\s0 for connecting to a guest running under \s-1QEMU\s0 +.PP +.Vb 1 +\& virt\-viewer \-\-connect qemu:///system .Ve .PP To connect to the guest with \s-1ID 7\s0 running under \s-1QEMU\s0 diff --git a/man/virt-viewer.pod b/man/virt-viewer.pod index ac9b268..ca1c9e8 100644 --- a/man/virt-viewer.pod +++ b/man/virt-viewer.pod @@ -5,7 +5,7 @@ =head1 SYNOPSIS -B [OPTIONS] -- DOMAIN-NAME|ID|UUID +B [OPTIONS] [DOMAIN-NAME|ID|UUID] =head1 DESCRIPTION @@ -71,6 +71,13 @@ Start with the window maximised to fullscreen +If supported, the remote display will be reconfigured to match the physical +client monitor configuration, by enabling or disabling extra monitors as +necessary. This is currently implemented by the Spice backend only. + +To specify which client monitors are used in fullscreen mode, see the +CONFIGURATION section below. + =item --debug Print debugging information @@ -117,11 +124,46 @@ =back +=head1 CONFIGURATION + +A small number of configuration options can be controlled by editing the +settings file located in the user configuration directory: + + /virt-viewer/settings + +This file is a text file in INI format, with application options in the +[virt-viewer] group and per-guest options in a group identified by the guest's +UUID. The application options should not be edited manually. There is also a +special [fallback] group which specifies options for all guests that don't have +an explicit group. + +For each guest, the initial fullscreen monitor configuration can be specified +by using the B key. This configuration only takes effect when +the -f/--full-screen option is specified. + +The value of this key is a list of mappings between a guest display and a +client monitor. Each mapping is separated by a semicolon character, and the +mappings have the format :. + +For example, to map guest displays 1 and 2 to client monitors 2 and 3 for the +guest with a UUID of e4591275-d9d3-4a44-a18b-ef2fbc8ac3e2, use: + + [e4591275-d9d3-4a44-a18b-ef2fbc8ac3e2] + monitor-mapping=1:2;2:3 + +The monitor-mapping must contain ids of all displays from 1 to the last +desired display id, e.g. "monitor-mapping=3:3" is invalid because mappings +for displays 1 and 2 are not specified. + =head1 EXAMPLES To connect to the guest called 'demo' running under Xen virt-viewer demo + +To use GUI for connecting to a guest running under QEMU + + virt-viewer --connect qemu:///system To connect to the guest with ID 7 running under QEMU diff --git a/mingw-virt-viewer.spec b/mingw-virt-viewer.spec new file mode 100644 index 0000000..782f62c --- /dev/null +++ b/mingw-virt-viewer.spec @@ -0,0 +1,181 @@ +%{?mingw_package_header} + +%define relver 1%{?dist} + +# We want the 1st part of the release number, and +# the 3rd part (or 0 if not present). We want to +# avoid the autobuild magic 'extra_release' too +# which is not purely numeric and larger than 255. +# This scheme lets us cope with RHEL-style z-stream +# versioning when creating Win product versions +%define rel0 %(echo %{relver} | cut -d. -f1) +%define rel1 %(test -z "`echo %{relver} | cut -d. -f3`" && echo 0 || (echo %{relver} | cut -d. -f3)) +%define buildid %(expr %{rel0} \\* 256 + %{rel1}) + +Name: mingw-virt-viewer +Version: 3.1 +Release: %{relver}%{?extra_release} +Summary: MinGW Windows virt-viewer console application + +License: GPLv2+ +Group: Applications/Internet +URL: http://virt-manager.org/ +Source0: ftp://virt-manager.org/downloads/virt-viewer/virt-viewer-%{version}.tar.gz + +BuildRequires: mingw32-filesystem >= 23 +BuildRequires: mingw64-filesystem >= 23 +BuildRequires: mingw32-glib2 >= 2.22.0 +BuildRequires: mingw64-glib2 >= 2.22.0 +BuildRequires: mingw32-glib-networking +BuildRequires: mingw64-glib-networking +BuildRequires: mingw32-gstreamer1-plugins-bad-free +BuildRequires: mingw64-gstreamer1-plugins-bad-free +BuildRequires: mingw32-gstreamer1-plugins-good +BuildRequires: mingw64-gstreamer1-plugins-good +BuildRequires: mingw32-gtk3 >= 3.0 +BuildRequires: mingw64-gtk3 >= 3.0 +BuildRequires: mingw32-libgovirt +BuildRequires: mingw64-libgovirt +BuildRequires: mingw32-libusbx +BuildRequires: mingw64-libusbx +BuildRequires: mingw32-libvirt >= 0.10.0 +BuildRequires: mingw64-libvirt >= 0.10.0 +BuildRequires: mingw32-libxml2 >= 2.6.0 +BuildRequires: mingw64-libxml2 >= 2.6.0 +BuildRequires: mingw32-gtk-vnc2 >= 0.4.0 +BuildRequires: mingw64-gtk-vnc2 >= 0.4.0 +BuildRequires: mingw32-readline +BuildRequires: mingw64-readline +BuildRequires: mingw32-rest +BuildRequires: mingw64-rest +BuildRequires: mingw32-spice-glib +BuildRequires: mingw64-spice-glib +BuildRequires: mingw32-spice-gtk3 >= 0.30 +BuildRequires: mingw64-spice-gtk3 >= 0.30 +BuildRequires: mingw32-usbredir +BuildRequires: mingw64-usbredir +BuildRequires: pkgconfig +BuildRequires: /usr/bin/pod2man +BuildRequires: intltool +BuildRequires: icoutils +BuildRequires: dos2unix +BuildRequires: hicolor-icon-theme +BuildRequires: adwaita-icon-theme +BuildRequires: hwdata +BuildRequires: msitools >= 0.94-2 + +BuildArch: noarch + +%package -n mingw32-virt-viewer +Summary: MinGW Windows virt-viewer console application +Group: Applications/Internet + +%package -n mingw64-virt-viewer +Summary: MinGW Windows virt-viewer console application +Group: Applications/Internet + +%package -n mingw64-virt-viewer-msi +Summary: MinGW Windows virt-viewer MSI +Group: Applications/Internet + +%package -n mingw32-virt-viewer-msi +Summary: MinGW Windows virt-viewer MSI +Group: Applications/Internet + +%description +MinGW Windows virt-viewer console application + +%description -n mingw32-virt-viewer +MinGW Windows virt-viewer console application + +%description -n mingw64-virt-viewer +MinGW Windows virt-viewer console application + +%description -n mingw64-virt-viewer-msi +MinGW Windows virt-viewer MSI + +%description -n mingw32-virt-viewer-msi +MinGW Windows virt-viewer MSI + +%{mingw_debug_package} + +%prep +%setup -q -n virt-viewer-%{version} + +%build +%mingw_configure --with-gtk=3.0 --with-buildid=%{buildid} + +%mingw_make %{?_smp_mflags} V=1 +%mingw_make %{?_smp_mflags} V=1 -C data msi + +%install +%mingw_make_install DESTDIR=$RPM_BUILD_ROOT + +%if 0%{?mingw_build_win32} == 1 +cp build_win32$MINGW_BUILDDIR_SUFFIX/data/virt-viewer-x86-3.1.msi $RPM_BUILD_ROOT/%{mingw32_datadir}/virt-viewer +%endif + +%if 0%{?mingw_build_win64} == 1 +cp build_win64$MINGW_BUILDDIR_SUFFIX/data/virt-viewer-x64-3.1.msi $RPM_BUILD_ROOT/%{mingw64_datadir}/virt-viewer +%endif + +%find_lang virt-viewer + +# Don't need the XDG desktop files on Windows +find $RPM_BUILD_ROOT -name "*.desktop" -delete + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -n mingw32-virt-viewer -f virt-viewer.lang +%defattr(-,root,root) +%{mingw32_bindir}/virt-viewer.exe +%{mingw32_bindir}/remote-viewer.exe +%{mingw32_bindir}/windows-cmdline-wrapper.exe +%{mingw32_bindir}/debug-helper.exe + +%dir %{mingw32_datadir}/virt-viewer/ +%dir %{mingw32_datadir}/virt-viewer/ui/ +%{mingw32_datadir}/virt-viewer/ui/virt-viewer.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-about.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-auth.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-guest-details.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-vm-connection.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-preferences.xml +%{mingw32_datadir}/virt-viewer/ui/remote-viewer-connect.xml +%{mingw32_datadir}/icons/hicolor/*/apps/* +%{mingw32_datadir}/icons/hicolor/*/devices/* + +%{mingw32_mandir}/man1/virt-viewer.1* +%{mingw32_mandir}/man1/remote-viewer.1* + +%files -n mingw32-virt-viewer-msi +%{mingw32_datadir}/virt-viewer/virt-viewer-x86-3.1.msi + +%files -n mingw64-virt-viewer -f virt-viewer.lang +%defattr(-,root,root) +%{mingw64_bindir}/virt-viewer.exe +%{mingw64_bindir}/remote-viewer.exe +%{mingw64_bindir}/windows-cmdline-wrapper.exe +%{mingw64_bindir}/debug-helper.exe + +%dir %{mingw64_datadir}/virt-viewer/ +%dir %{mingw64_datadir}/virt-viewer/ui/ +%{mingw64_datadir}/virt-viewer/ui/virt-viewer.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-about.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-auth.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-guest-details.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-vm-connection.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-preferences.xml +%{mingw64_datadir}/virt-viewer/ui/remote-viewer-connect.xml +%{mingw64_datadir}/icons/hicolor/*/apps/* +%{mingw64_datadir}/icons/hicolor/*/devices/* + +%{mingw64_mandir}/man1/virt-viewer.1* +%{mingw64_mandir}/man1/remote-viewer.1* + +%files -n mingw64-virt-viewer-msi +%{mingw64_datadir}/virt-viewer/virt-viewer-x64-3.1.msi + +%changelog diff --git a/mingw-virt-viewer.spec.in b/mingw-virt-viewer.spec.in index bf83d08..4a802c5 100644 --- a/mingw-virt-viewer.spec.in +++ b/mingw-virt-viewer.spec.in @@ -4,7 +4,7 @@ # We want the 1st part of the release number, and # the 3rd part (or 0 if not present). We want to -# avoid the autobuild magic %{extra_release} too +# avoid the autobuild magic 'extra_release' too # which is not purely numeric and larger than 255. # This scheme lets us cope with RHEL-style z-stream # versioning when creating Win product versions @@ -26,26 +26,32 @@ BuildRequires: mingw64-filesystem >= 23 BuildRequires: mingw32-glib2 >= @GLIB2_REQUIRED@ BuildRequires: mingw64-glib2 >= @GLIB2_REQUIRED@ -BuildRequires: mingw32-gstreamer-plugins-bad-free -BuildRequires: mingw64-gstreamer-plugins-bad-free -BuildRequires: mingw32-gstreamer-plugins-good -BuildRequires: mingw64-gstreamer-plugins-good -BuildRequires: mingw32-gtk2 >= @GTK2_REQUIRED@ -BuildRequires: mingw64-gtk2 >= @GTK2_REQUIRED@ +BuildRequires: mingw32-glib-networking +BuildRequires: mingw64-glib-networking +BuildRequires: mingw32-gstreamer1-plugins-bad-free +BuildRequires: mingw64-gstreamer1-plugins-bad-free +BuildRequires: mingw32-gstreamer1-plugins-good +BuildRequires: mingw64-gstreamer1-plugins-good +BuildRequires: mingw32-gtk3 >= @GTK3_REQUIRED@ +BuildRequires: mingw64-gtk3 >= @GTK3_REQUIRED@ +BuildRequires: mingw32-libgovirt +BuildRequires: mingw64-libgovirt BuildRequires: mingw32-libusbx BuildRequires: mingw64-libusbx BuildRequires: mingw32-libvirt >= @LIBVIRT_REQUIRED@ BuildRequires: mingw64-libvirt >= @LIBVIRT_REQUIRED@ BuildRequires: mingw32-libxml2 >= @LIBXML2_REQUIRED@ BuildRequires: mingw64-libxml2 >= @LIBXML2_REQUIRED@ -BuildRequires: mingw32-gtk-vnc >= @GTK_VNC1_REQUIRED@ -BuildRequires: mingw64-gtk-vnc >= @GTK_VNC1_REQUIRED@ +BuildRequires: mingw32-gtk-vnc2 >= @GTK_VNC2_REQUIRED@ +BuildRequires: mingw64-gtk-vnc2 >= @GTK_VNC2_REQUIRED@ BuildRequires: mingw32-readline BuildRequires: mingw64-readline +BuildRequires: mingw32-rest +BuildRequires: mingw64-rest BuildRequires: mingw32-spice-glib BuildRequires: mingw64-spice-glib -BuildRequires: mingw32-spice-gtk >= @SPICE_GTK_REQUIRED@ -BuildRequires: mingw64-spice-gtk >= @SPICE_GTK_REQUIRED@ +BuildRequires: mingw32-spice-gtk3 >= @SPICE_GTK_REQUIRED@ +BuildRequires: mingw64-spice-gtk3 >= @SPICE_GTK_REQUIRED@ BuildRequires: mingw32-usbredir BuildRequires: mingw64-usbredir BuildRequires: pkgconfig @@ -54,8 +60,9 @@ BuildRequires: icoutils BuildRequires: dos2unix BuildRequires: hicolor-icon-theme -BuildRequires: gnome-icon-theme -BuildRequires: msitools >= 0.92-2 +BuildRequires: adwaita-icon-theme +BuildRequires: hwdata +BuildRequires: msitools >= 0.94-2 BuildArch: noarch @@ -96,7 +103,7 @@ %setup -q -n virt-viewer-%{version} %build -%mingw_configure --with-gtk=2.0 --with-buildid=%{buildid} +%mingw_configure --with-gtk=3.0 --with-buildid=%{buildid} %mingw_make %{?_smp_mflags} V=1 %mingw_make %{?_smp_mflags} V=1 -C data msi @@ -133,6 +140,10 @@ %{mingw32_datadir}/virt-viewer/ui/virt-viewer.xml %{mingw32_datadir}/virt-viewer/ui/virt-viewer-about.xml %{mingw32_datadir}/virt-viewer/ui/virt-viewer-auth.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-guest-details.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-vm-connection.xml +%{mingw32_datadir}/virt-viewer/ui/virt-viewer-preferences.xml +%{mingw32_datadir}/virt-viewer/ui/remote-viewer-connect.xml %{mingw32_datadir}/icons/hicolor/*/apps/* %{mingw32_datadir}/icons/hicolor/*/devices/* @@ -154,6 +165,10 @@ %{mingw64_datadir}/virt-viewer/ui/virt-viewer.xml %{mingw64_datadir}/virt-viewer/ui/virt-viewer-about.xml %{mingw64_datadir}/virt-viewer/ui/virt-viewer-auth.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-guest-details.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-vm-connection.xml +%{mingw64_datadir}/virt-viewer/ui/virt-viewer-preferences.xml +%{mingw64_datadir}/virt-viewer/ui/remote-viewer-connect.xml %{mingw64_datadir}/icons/hicolor/*/apps/* %{mingw64_datadir}/icons/hicolor/*/devices/* diff --git a/po/LINGUAS b/po/LINGUAS index 3324170..265ad73 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,12 +1,9 @@ -ach af -af_ZA -aln am +anp ar as ast -az bal be bg @@ -17,70 +14,55 @@ brx bs ca -cs_CZ cs cy da de_CH de -dz el en_GB -en_US eo -es_ES es et -eu_ES eu -fa_IR fa fi fr -ga gl gu he hi -hr_HR hr hu -hy ia id ilo is -it_IT it -ja_JP ja ka kk km kn ko -ks -ku +kw_GB +kw@kkcor +kw +kw@uccor ky -la -lo lt lv mai -mg mk ml mn mr -ms_MY ms -my nb nds ne nl nn -no nso or pa @@ -89,7 +71,6 @@ pt ro ru -ru_RU si sk sl @@ -97,20 +78,17 @@ sr@latin sr sv -ta_IN ta te tg th -tl tr +tw uk -uk_UA ur -uz vi -wo -xh +wba +yo zh_CN zh_HK zh_TW diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 06a8cfe..fcd2c3b 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -80,7 +79,7 @@ .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< @@ -108,7 +107,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff --git a/po/POTFILES.in b/po/POTFILES.in index 40f8ba4..9dcc6a3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,13 +3,20 @@ src/gbinding.c src/remote-viewer-main.c src/remote-viewer.c +[type: gettext/glade] src/remote-viewer-connect.xml [type: gettext/glade] src/virt-viewer-about.xml src/virt-viewer-app.c +src/virt-viewer-auth.c [type: gettext/glade] src/virt-viewer-auth.xml +src/virt-viewer-display-vnc.c src/virt-viewer-main.c src/virt-viewer-session-spice.c src/virt-viewer-session-vnc.c +src/virt-viewer-vm-connection.c src/virt-viewer-window.c src/virt-viewer-file.c src/virt-viewer.c [type: gettext/glade] src/virt-viewer.xml +[type: gettext/glade] src/virt-viewer-guest-details.xml +[type: gettext/glade] src/virt-viewer-vm-connection.xml +[type: gettext/glade] src/virt-viewer-preferences.xml diff --git a/po/ach.po b/po/ach.po deleted file mode 100644 index 622ca9e..0000000 --- a/po/ach.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Acoli (http://www.transifex.com/projects/p/virt-viewer/language/ach/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ach\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/af.po b/po/af.po index f82675b..0af8b78 100644 --- a/po/af.po +++ b/po/af.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Afrikaans (http://www.transifex.com/projects/p/virt-viewer/language/af/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Afrikaans\n" +"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: af\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/af_ZA.po b/po/af_ZA.po deleted file mode 100644 index 2794edc..0000000 --- a/po/af_ZA.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/fedora/language/af_ZA/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: af_ZA\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/aln.po b/po/aln.po deleted file mode 100644 index 39873b0..0000000 --- a/po/aln.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Albanian Gheg (http://www.transifex.com/projects/p/virt-viewer/language/aln/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: aln\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/am.po b/po/am.po index 45f8802..6d7df9f 100644 --- a/po/am.po +++ b/po/am.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Amharic (http://www.transifex.com/projects/p/virt-viewer/language/am/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Amharic\n" +"Language: am\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: am\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/anp.po b/po/anp.po new file mode 100644 index 0000000..55d92f4 --- /dev/null +++ b/po/anp.po @@ -0,0 +1,757 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Angika\n" +"Language: anp\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: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ar.po b/po/ar.po index f1cc3fb..1dc4b69 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/virt-viewer/language/ar/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Arabic\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/as.po b/po/as.po index 8c3398d..8e8ad64 100644 --- a/po/as.po +++ b/po/as.po @@ -1,26 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Amitakhya Phukan , 2010 # Nilamdyuti Goswami , 2012 # Nilamdyuti Goswami , 2012-2014 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Assamese (http://www.transifex.com/projects/p/virt-viewer/language/as/)\n" +"Language-Team: Assamese (http://www.transifex.com/projects/p/virt-viewer/" +"language/as/)\n" +"Language: as\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: as\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "দূৰৱৰ্তী দৰ্শক" @@ -74,103 +76,140 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "দুৰৱৰ্তী-দৰ্শক সংস্কৰণ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "সংস্কৰণ তথ্য প্ৰদৰ্শন কৰক" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "উইন্ডো শীৰ্ষক সংহতি কৰক" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Spice নিয়ন্ত্ৰক সংযোগ ব্যৱহাৰ কৰি সংযোগ খোলক" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "দূৰৱৰ্তী দৰ্শক ক্লাএণ্ট" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s⏎ উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে '%s --help' চাওক⏎\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s⏎ উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে '%s --help' চাওক⏎\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "ত্ৰুটি: Spice নিয়ন্ত্ৰক ব্যৱহাৰ কৰোতে অতিৰিক্ত ত্ৰকসমূহ দিয়া হৈছে\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "ত্ৰুটি: কেইবাটাও URls নিয়ন্ত্ৰণ কৰিব নোৱাৰি\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "সংযোগ আৰম্ভ কৰিবলে ব্যৰ্থ" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "প্ৰদৰ্শন নিয়ন্ত্ৰক দ্বাৰা অসামৰ্থবান কৰা হৈছে" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "নিয়ন্ত্ৰক সংযোগ ব্যৰ্থ হল: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "সংযোগৰ বিৱৰণসমূহ" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "এটা Spice অধিবেশন সৃষ্টি কৰিব পৰা নগল" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice অধিবেশন সংহতি কৰা হৈ আছে..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "অবৈধ ফাইল %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI ৰ পৰা সংযোগ ধৰণ নিৰ্ধাৰণ কৰিব পৰা নগল" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt অধিবেশন খোলিব পৰা নগল" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "এই ধৰণৰ বাবে এটা অধিবেশন সৃষ্টি কৰিব পৰা নগল: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "সংযোগৰ বিৱৰণসমূহ" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "উদাহৰণস্বৰূপ, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade ৰ বিষয়ে" @@ -180,10 +219,13 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"স্বত্বাধিকাৰ (C) ২০০৭-২০১২ Daniel P. Berrange\n" +"স্বত্বাধিকাৰ (C) ২০০৭-২০১৪ Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "GTK-VNC, SPICE-GTK আৰু libvirt ৰ সৈতে নিৰ্মাণ কৰা এটা দূৰৱৰ্তী ডেস্কটপ ক্লাএন্ট" +msgstr "" +"GTK-VNC, SPICE-GTK আৰু libvirt ৰ সৈতে নিৰ্মাণ কৰা এটা দূৰৱৰ্তী ডেস্কটপ ক্লাএন্ট" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -204,133 +246,165 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "এই প্ৰগ্ৰামটো এটা বিনামুলিয়া চফ্টৱেৰ; আপুনি Free Software Foundation ৰ দ্বাৰা প্ৰকাশিত GNU General Public License ৰ চুক্তিসমূহৰ অন্তৰ্গত ইয়াক পুনৰ বিলাব পাৰিব অথবা সলনি কৰিব পাৰিব; হৈতো অনুজ্ঞাৰ সংস্কৰণ ২, অথবা (আপুনাৰ বিকল্পত) যিকোনো পৰৱৰ্তী সংস্কৰণ।\n\nএই প্ৰগ্ৰামটো এইটো আশাত বিলোৱা হৈছে যে ই ব্যৱহাৰযোগ্য হ'ব, কিন্তু কোনো ৱাৰেন্টি নথকাকৈ; ব্যৱসায়ীক অথবা কোনো এটা বিশেষ কাৰণৰ যোগ্যতাৰ বাবে বুজুৱা ৱাৰেন্টি নথকাকৈ। অধিক যানিবলৈ GNU General Public License চাওক।\n\nআপুনি হৈতো ইতিমধ্যে এই প্ৰগ্ৰামৰ সৈতে GNU General Public License ৰ কপি এটা পাইছে; যদি নাই, Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA লে লিখক\n" +msgstr "" +"এই প্ৰগ্ৰামটো এটা বিনামুলিয়া চফ্টৱেৰ; আপুনি Free Software Foundation ৰ দ্বাৰা " +"প্ৰকাশিত GNU General Public License ৰ চুক্তিসমূহৰ অন্তৰ্গত ইয়াক পুনৰ বিলাব পাৰিব " +"অথবা সলনি কৰিব পাৰিব; হৈতো অনুজ্ঞাৰ সংস্কৰণ ২, অথবা (আপুনাৰ বিকল্পত) যিকোনো " +"পৰৱৰ্তী সংস্কৰণ।\n" +"\n" +"এই প্ৰগ্ৰামটো এইটো আশাত বিলোৱা হৈছে যে ই ব্যৱহাৰযোগ্য হ'ব, কিন্তু কোনো ৱাৰেন্টি " +"নথকাকৈ; ব্যৱসায়ীক অথবা কোনো এটা বিশেষ কাৰণৰ যোগ্যতাৰ বাবে বুজুৱা ৱাৰেন্টি " +"নথকাকৈ। অধিক যানিবলৈ GNU General Public License চাওক।\n" +"\n" +"আপুনি হৈতো ইতিমধ্যে এই প্ৰগ্ৰামৰ সৈতে GNU General Public License ৰ কপি এটা " +"পাইছে; যদি নাই, Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA লে " +"লিখক\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora অনুবাদ দল" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "আপুনি অধিবেশন বন্ধ কৰিব বিচাৰে নে?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "মোক আকৌ নুশুধিব" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "প্ৰদৰ্শন %d ৰ বাবে অপেক্ষা কৰা হৈ আছে..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "অতিথি %s ৰ বাবে অজ্ঞাত গ্ৰাফিক ধৰণ" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh লে সংযোগ ব্যৰ্থ হল।" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "চেনেলে সংযোগ কৰিব নোৱাৰি, কেৱল SSH সমৰ্থিত।" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "চেনেললে সংযোগ অসমৰ্থিত।" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "গ্ৰাফিক চাৰ্ভাৰলে সংযোগ কৰা হৈ আছে" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "অতিথি ডমেইন বন্ধ হল" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "গ্ৰাফিক চাৰ্ভাৰলে সংযোগিত" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "গ্ৰাফিক চাৰ্ভাৰ %s লে সংযোগ কৰিবলে অক্ষম" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s ত দূৰৱৰ্তী ডেস্কটপ চাৰ্ভাৰৰ সৈতে প্ৰমাণীত কৰিবলে অক্ষম: %s\nসংযোগ পুনৰ চেষ্টা কৰিব নে?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "দূৰৱৰ্তী ডেস্কটপ চাৰ্ভাৰৰ সৈতে প্ৰমাণিত কৰিবলে অক্ষম: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB পুনৰনিৰ্দেশ ত্ৰুটি: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "জুম স্তৰ %d-%d ৰ মাজত হব লাগিব\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d প্ৰদৰ্শন কৰক" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "অবৈধ kiosk-quit তৰ্ক: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "উইন্ডোৰ জুম স্তৰ, শতাংশত" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "পূৰ্ণ পৰ্দা অৱস্থাত খোলক (ক্লাএন্টৰ সৈতে খাপ খোৱাবলে অতিথিৰ বিভেদন ধাৰ্য্য কৰে)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"পূৰ্ণ পৰ্দা অৱস্থাত খোলক (ক্লাএন্টৰ সৈতে খাপ খোৱাবলে অতিথিৰ বিভেদন ধাৰ্য্য কৰে)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "হটকি'সমূহ স্বনিৰ্বাচন কৰক" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "কিঅস্ক অৱস্থা সামৰ্থবান কৰক" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "কিঅস্ক অৱস্থাত দিয়া চুক্তিত প্ৰস্থান কৰিব" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "ভাৰভৌচ তথ্য প্ৰদৰ্শন কৰক" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ডিবাগ তথ্য প্ৰদৰ্শন কৰক" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "প্ৰমাণীকৰণৰ প্ৰয়োজন" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "লেবেল" @@ -342,6 +416,14 @@ msgid "Username:" msgstr "ব্যৱহাৰকাৰীৰ নাম:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -378,200 +460,236 @@ #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "ভাৰছুৱেল মেচিন গ্ৰাফিকেল কনচৌল" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nব্যৱহাৰপদ্ধতি: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "অবৈধ পাছৱাৰ্ড" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "পুনৰনিৰ্দেশৰ বাবে USB ডিভাইচসমূহ বাছক" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "অসমৰ্থিত প্ৰমাণীকৰণ ধৰণ %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "স্ক্ৰিনশ্বট" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "বিচ্ছিন্ন কৰক" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB ডিভাইছ নিৰ্বাচন" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "চাবি সংযুক্তি পঠাওক" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "পূৰ্ণপৰ্দা ত্যাগ কৰক" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(পোইন্টাৰ এৰিবলে %s টিপক)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "এই সংযোগ সংস্থাপন কৰিবলে অন্তত %s সংস্কৰণ %s ৰ প্ৰয়োজন" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "অতিথি ডমেইন পুনৰাম্ভ হোৱাৰ বাবে অপেক্ষা কৰা হৈ আছে" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "অতিথি %s ৰ বাবে গ্ৰাফিক ধৰণ নিৰ্ধাৰণ কৰিব নোৱাৰি" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "অতিথি %s ৰ বাবে গ্ৰাফিক ঠিকনা নিৰ্ধাৰণ কৰিব নোৱাৰি" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "অতিথি %s ৰ বাবে হস্ট নিৰ্ধাৰণ কৰিব নোৱাৰি" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt আৰম্ভ হবলে অপেক্ষা কৰা হৈছে" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "অতিথি ডমেইন বিচৰা" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "অতিথি ডমেইন সৃষ্টি হোৱালে অপেক্ষা কৰা হৈ আছে" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "%s অতিথিৰ ডোমেইন পোৱা নাযায়" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "অতিথি ডমেইন অৱস্থা নীৰিক্ষণ কৰা" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "অতিথি ডমেইন আৰম্ভ হোৱালে অপেক্ষা কৰা হৈ আছে" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "অতিথি ডমেইন দ্বাৰা চাৰ্ভাৰ আৰম্ভ কৰিবলে অপেক্ষা কৰা হৈ আছে" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "%s URI ৰে libvirt লৈ সংযোগ কৰিব নোৱাৰি" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[none]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ফাইল (_F)" @@ -584,30 +702,78 @@ msgid "Smartcard removal" msgstr "স্মাৰ্টকাৰ্ড আতৰোৱা" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "দৰ্শন কৰক (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "সম্পূৰ্ণ পৰ্দা" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "জুম কৰক (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "প্ৰদৰ্শনসমূহ" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "উন্মোচন কাৰ্চাৰ" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "কি পঠাওক (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "সহায় (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ast.po b/po/ast.po index d9c2fc5..72d9710 100644 --- a/po/ast.po +++ b/po/ast.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Asturian (http://www.transifex.com/projects/p/virt-viewer/language/ast/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Asturian\n" +"Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ast\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/az.po b/po/az.po deleted file mode 100644 index 46866c9..0000000 --- a/po/az.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/virt-viewer/language/az/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: az\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/bal.po b/po/bal.po index 6fbae8d..a91670e 100644 --- a/po/bal.po +++ b/po/bal.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Balochi (http://www.transifex.com/projects/p/virt-viewer/language/bal/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Baluchi\n" +"Language: bal\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bal\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/be.po b/po/be.po index 3745c46..f497114 100644 --- a/po/be.po +++ b/po/be.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Belarusian (http://www.transifex.com/projects/p/virt-viewer/language/be/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Belarusian\n" +"Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: be\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/bg.po b/po/bg.po index f4ec1e3..a37e28c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Valentin Laskov , 2012-2013 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/virt-viewer/language/bg/)\n" +"Language-Team: Bulgarian (http://www.transifex.com/projects/p/virt-viewer/" +"language/bg/)\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Remote Viewer" @@ -72,103 +74,143 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer версия %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Показва информация за версията" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Задаване заглавие на прозореца" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Отвори връзка чрез комуникационния контролер Spice" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nСтартирайте '%s --help' за да видите пълен списък на опциите в командния ред\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Стартирайте '%s --help' за да видите пълен списък на опциите в командния " +"ред\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Грешка: подадени са излишни аргументи докато се ползва Spice контролер\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Грешка: подадени са излишни аргументи докато се ползва Spice контролер\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Грешка: не мога да обработя няколко URI-а\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Неуспешно инициализиране на връзка" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Дисплеят е забранен от контролера" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Връзката на контролера пропадна: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Параметри на връзката" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Не мога да създам Spice сесия" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Създаване на Spice сесия..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Невалиден файл %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "От това URI не може да се определи типа на връзката" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Не можах да отворя oVirt сесия" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Не може да се създаде сесия от този тип: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Параметри на връзката" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Относно Glade" @@ -202,133 +244,167 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Тази програма е свободен софтуер; Вие можете да я разпространявате\nи/или променяте под условията на GNU General Public License, както е публикуван от\nFree Software Foundation; версия 2 на лиценза, или по (ваше усмотрение),\nкоято и да е по-късна версия.\n\nТази програма се разпространява с надеждата, че ще бъде полезна,\nно БЕЗ КАКВАТО И ДА Е ГАРАНЦИЯ; без дори косвена гаранция за\nПРОДАВАЕМОСТ или ПРИГОДНОСТ ЗА ОПРЕДЕЛЕНА ЦЕЛ. Вижте\nGNU General Public License за повече подробности.\n\nВие би трябвало да сте получили копие на GNU General Public License\nзаедно с тази програма; ако не, пишете на Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"Тази програма е свободен софтуер; Вие можете да я разпространявате\n" +"и/или променяте под условията на GNU General Public License, както е " +"публикуван от\n" +"Free Software Foundation; версия 2 на лиценза, или по (ваше усмотрение),\n" +"която и да е по-късна версия.\n" +"\n" +"Тази програма се разпространява с надеждата, че ще бъде полезна,\n" +"но БЕЗ КАКВАТО И ДА Е ГАРАНЦИЯ; без дори косвена гаранция за\n" +"ПРОДАВАЕМОСТ или ПРИГОДНОСТ ЗА ОПРЕДЕЛЕНА ЦЕЛ. Вижте\n" +"GNU General Public License за повече подробности.\n" +"\n" +"Вие би трябвало да сте получили копие на GNU General Public License\n" +"заедно с тази програма; ако не, пишете на Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" -msgstr "The Fedora Translation Team\nВалентин Ласков, 2012" - -#: ../src/virt-viewer-app.c:400 +msgstr "" +"The Fedora Translation Team\n" +"Валентин Ласков, 2012" + +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Желаете ли да прекратите сесията?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Не ме питай отново" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Изчаквам за да покажа %d..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Неизвестен тип графика за госта %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Връзката към ssh пропадна." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Не мога да се свържа към канала, поддържа се само SSH." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Свързване към канал не се поддържа." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Свързване към графичен сървър" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Виртуализиращата среда на госта беше спряна" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Свързан към графичен сървър" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Невъзможно е да се свържа с графичния сървър %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Невъзможно е удостоверяването пред отдалечения десктоп сървър на %s: %s\nДа опитам ли свързването отново?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Невъзможно е удостоверяването пред отдалечения десктоп сървър: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Грешка при USB пренасочването: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Zoom level трябва да е в рамките %d-%d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Дисплей %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Невалиден kiosk-quit аргумент: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Размер на прозореца в проценти" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Настройка на клавишни комбинации" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Разрешаване на kiosk режим" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Изход при дадено състояние в kiosk режим" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Показва по-подробна информация" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Показва информация за отстраняване на грешки" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Изисква се удостоверяване" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "етикет" @@ -340,6 +416,14 @@ msgid "Username:" msgstr "Потребител:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -372,204 +456,241 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Стартирайте '%s --help' за да видите пълен списък на опциите в командния ред" +msgstr "" +"Стартирайте '%s --help' за да видите пълен списък на опциите в командния ред" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nУпотреба: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "невалидна парола" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Изберете USB устройства за пренасочване" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Не се поддържа удостоверяване тип %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Снимка на екрана" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Изключване" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Избор на USB устройства" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Изпращане на клавишна комбинация" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Изход от Цял екран" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Натиснете %s за освобождаване на показалеца)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "Изисква се %s поне версия %s за създаване на тази връзка" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Изчакване виртуализиращата среда на госта да се рестартира" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Не мога да определя графичния тип за госта %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Не мога да определя графичния адрес за госта %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Не мога да определя хоста за госта %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Изчаквам стартирането на libvirt" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Търсене на виртуализиращата среда на госта" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Изчакване виртуализиращата среда да бъде създадена" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Не мога да намеря виртуализиращата среда на госта %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Проверка състоянието на виртуализиращата среда" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Изчакване виртуализиращата среда на госта да бъде стартирана" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Изчакване виртуализиращата среда на госта да стартира сървър" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Не е възможна връзка към libvirt с URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[нищо]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Файл" @@ -582,30 +703,78 @@ msgid "Smartcard removal" msgstr "Премахване на смарткарта" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Изглед" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Цял екран" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Мащабиране" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Екрани" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Освобождаване на показалеца" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "Изпрати _клавиш" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Помощ" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/bn.po b/po/bn.po index 6a58dd4..9fead0d 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Ayesha Akhtar , 2012 # Mahay Alam Khan , 2012 @@ -11,19 +11,21 @@ # runa , 2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Bengali (http://www.transifex.com/projects/p/virt-viewer/language/bn/)\n" +"Language-Team: Bengali (http://www.transifex.com/projects/p/virt-viewer/" +"language/bn/)\n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -77,103 +79,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer সংস্করণ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "সংস্করণ সংক্রান্ত তথ্য প্রদর্শন করা হবে" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Spice কন্ট্রোলারের যোগাব্যবস্থার মাধ্যমে সংযোগ আরম্ভ করা হবে" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "সংযোগ আরম্ভ করতে ব্যর্থ" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "কন্ট্রোলার দ্বারা প্রদর্শন নিষ্ক্রিয় করা হয়েছে" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "কন্ট্রোলারের সংযোগ স্থাপন করতে ব্যর্থ: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "একটি Spice সেশান প্রস্তুত করতে ব্যর্থ" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice-র সেশান প্রস্তুত করা হচ্ছে..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI থেকে সংযোগের ধরন নির্ধারণ করা সম্ভব নয়" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "এই ধরনের জন্য সেশান প্রস্তুত করা যায়নি: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade পরিচিতি" @@ -207,133 +245,166 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n\nএই প্রোগ্রামটি বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু \nএটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম সাধনের \nজন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত। অধিক জানতে GNU General Public License পড়ুন।\n\nএই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া উচিত; \nনা থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, Inc., \n59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General " +"Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ " +"অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n" +"\n" +"এই প্রোগ্রামটি বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু \n" +"এটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম " +"সাধনের \n" +"জন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত। অধিক জানতে GNU General Public License " +"পড়ুন।\n" +"\n" +"এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া " +"উচিত; \n" +"না থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, " +"Inc., \n" +"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora-র অনুবাদকদের দল" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "%d প্রদর্শনের জন্য অপেক্ষা করা হচ্ছে..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "%s গেস্ট মেশিনের জন্য অজানা ধরনের গ্রাফিক" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh-র সাথে সংযোগ করতে ব্যর্থ।" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "চ্যানেলের সাথে সংযোগ করা যায়নি, শুধুমাত্র SSH সমর্থিত হবে।" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "সমর্থন বিনা চ্যানেলের সাথে সংযোগ করা হবে।" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হচ্ছে" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "গেস্ট ডোমেইন বন্ধ হয়েছে" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হয়েছে" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "%s গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s-এ উপস্থিত দূরবর্তী ডেস্কটপ সার্ভারে অনুমোদন করতে ব্যর্থ: %s\nপুনরায় সংযোগের প্রচেষ্টা করা হবে কি?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "দূরবর্তী ডেস্কটপ সার্ভারের সাথে অনুমোদন করতে ব্যর্থ: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB পুনর্নির্দেশে সমস্যা: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "উইন্ডোর প্রদর্শনের মাপ, শতাংশে ব্যক্ত" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "ভার্বোস তথ্য প্রদর্শন করা হবে" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ডিবাগ সংক্রান্ত তথ্য প্রদর্শন করা হবে" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "অনুমোদন প্রয়োজন" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "label" @@ -345,6 +416,14 @@ msgid "Username:" msgstr "ব্যবহারকারীর নাম:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -383,198 +462,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nব্যবহার পদ্ধতি: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "পুনর্নির্দেশের জন্য USB ডিভাইস নির্বাচন করুন" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "%d ধরনের অনুমোদন সমর্থিত নয়" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "স্ক্রিন-শট" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "সংযোগ বিচ্ছেদ করুন" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB ডিভাইস নির্বাচন" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "সম্পূর্ণ পর্দায় প্রদর্শন থেকে প্রস্থান" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "গেস্ট ডোমেইন পুনরায় আরম্ভের অপেক্ষা করা হচ্ছে" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "%s গেস্ট মেশিনের জন্য গ্রাফিকের ধরন নির্ধারণ করা সম্ভব নয়" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "%s গেস্ট মেশিনের জন্য গ্রাফিক ঠিকানা নির্ধারণ করা সম্ভব নয়" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "%s গেস্ট মেশিনের জন্য হোস্ট নির্ধারণ করা সম্ভব নয়" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "গেস্ট ডোমেইন সন্ধান করা হচ্ছে" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "গেস্ট ডোমেইন প্রস্তুতির অপেক্ষা করা হচ্ছে" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "%s গেস্ট ডোমেইন সন্ধান করতে ব্যর্থ" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "গেস্ট ডোমেইনের অবস্থা পরীক্ষা করতে ব্যর্থ" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "গেস্ট ডোমেইন আরম্ভের অপেক্ষা করা হচ্ছে" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "গেস্ট ডোমেইন দ্বারা সার্ভার আরম্ভের অপেক্ষা করা হচ্ছে" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s সহযোগে libvirt-র সাথে সংযোগ করতে ব্যর্থ" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[শূণ্য]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ফাইল (_F)" @@ -587,30 +702,78 @@ msgid "Smartcard removal" msgstr "স্মার্ট-কার্ড অপসারণ" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "প্রদর্শন (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "সম্পূর্ণ পর্দায় প্রদর্শন" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "প্রদর্শনের নাম (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "প্রদর্শনক্ষেত্র" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "কার্সার মুক্ত করা হবে" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "কি পাঠিয়ে দিন (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "সহায়তা (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/bn_IN.po b/po/bn_IN.po index 3446839..379672f 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -1,26 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # runab , 2010,2012 # runa , 2012 -# Saibal Ray, 2013 +# Saibal Ray, 2013-2014 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/virt-viewer/language/bn_IN/)\n" +"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/virt-" +"viewer/language/bn_IN/)\n" +"Language: bn-IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bn_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "দূরবর্তী প্রদর্শন" @@ -74,103 +76,142 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer সংস্করণ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "সংস্করণ সংক্রান্ত তথ্য প্রদর্শন করা হবে" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "উইন্ডো টাইটেল সেট করুন" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Spice কন্ট্রোলারের যোগাব্যবস্থার মাধ্যমে সংযোগ আরম্ভ করা হবে" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "রিমোট ভিউয়ার ক্লায়েন্ট" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nকমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' প্রয়োগ করুন।\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"কমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' প্রয়োগ " +"করুন।\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "ত্রুটি: Spice কনট্রোলার ব্যবহার করার সময় অতিরিক্ত আর্গুমেন্ট প্রয়োগ করা হয়েছে\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "ত্রুটি: একাধিক URI পরিচালনা করা সম্ভব নয়\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "সংযোগ আরম্ভ করতে ব্যর্থ" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "কন্ট্রোলার দ্বারা প্রদর্শন নিষ্ক্রিয় করা হয়েছে" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "কন্ট্রোলারের সংযোগ স্থাপন করতে ব্যর্থ: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "সংযোগ সংক্রান্ত বিবরণ" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "একটি Spice সেশান প্রস্তুত করতে ব্যর্থ" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice-র সেশান প্রস্তুত করা হচ্ছে..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "অবৈধ ফাইল %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI থেকে সংযোগের ধরন নির্ধারণ করা সম্ভব নয়" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt সেশান খুলতে ব্যর্থ" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "এই ধরনের জন্য সেশান প্রস্তুত করা যায়নি: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "সংযোগ সংক্রান্ত বিবরণ" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "উদাহরণস্বরূপ, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade পরিচিতি" @@ -180,6 +221,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"কপিরাইট (C) 2007-2012 Daniel P. Berrange\n" +"কপিরাইট (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -204,133 +247,168 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n\nএই প্রোগ্রামটি বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু \nএটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম সাধনের \nজন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত। অধিক জানতে GNU General Public License পড়ুন।\n\nএই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া উচিত; \nনা থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, Inc., \n59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General " +"Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ " +"অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n" +"\n" +"এই প্রোগ্রামটি বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু \n" +"এটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম " +"সাধনের \n" +"জন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত। অধিক জানতে GNU General Public License " +"পড়ুন।\n" +"\n" +"এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া " +"উচিত; \n" +"না থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, " +"Inc., \n" +"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora-র অনুবাদকদের দল" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "অাপনি কী সেশন বন্ধ করতে চান?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "অামকে অাবার জিজ্ঞাসা করবেন না" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "%d প্রদর্শনের জন্য অপেক্ষা করা হচ্ছে..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "%s গেস্ট মেশিনের জন্য অজানা ধরনের গ্রাফিক" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh-র সাথে সংযোগ করতে ব্যর্থ।" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "চ্যানেলের সাথে সংযোগ করা যায়নি, শুধুমাত্র SSH সমর্থিত হবে।" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "সমর্থন বিনা চ্যানেলের সাথে সংযোগ করা হবে।" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হচ্ছে" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "গেস্ট ডোমেইন বন্ধ হয়েছে" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হয়েছে" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "%s গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s-এ উপস্থিত দূরবর্তী ডেস্কটপ সার্ভারে অনুমোদন করতে ব্যর্থ: %s\nপুনরায় সংযোগের প্রচেষ্টা করা হবে কি?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "দূরবর্তী ডেস্কটপ সার্ভারের সাথে অনুমোদন করতে ব্যর্থ: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB পুনর্নির্দেশে সমস্যা: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "জুম মাত্রা অবশ্যই %d-%d এর মধ্যবর্তী হতে হবে\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "প্রদর্শন %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "অবৈধ kiosk-quit আর্গুমেন্ট: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "উইন্ডোর প্রদর্শনের মাপ, শতাংশে ব্যক্ত" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" - -#: ../src/virt-viewer-app.c:2314 +"সম্পূর্ণ পর্দায় প্রদর্শনের মোডে খোলা হবে (ক্লায়েন্ট সঠিক মাপে প্রদর্শনের জন্য গেস্ট " +"সিস্টেমের রেসোলিউশন পরিবর্তন করা হয়)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "কাস্টোমাইজ হটকী" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "কিয়োস্ক মোড সক্রিয় করুন" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "কিয়োস্ক মোডে প্রদত্ত অবস্থায় প্রস্থান করুন" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "ভার্বোস তথ্য প্রদর্শন করা হবে" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ডিবাগ সংক্রান্ত তথ্য প্রদর্শন করা হবে" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "অনুমোদন প্রয়োজন" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "label" @@ -342,6 +420,14 @@ msgid "Username:" msgstr "ব্যবহারকারীর নাম:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -374,204 +460,241 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "কমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' প্রয়োগ করুন" +msgstr "" +"কমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' প্রয়োগ করুন" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "ভার্চুয়াল মেশিনের গ্রাফিক্যাল কনসোল" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nব্যবহার পদ্ধতি: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "অবৈধ পাসওয়ার্ড" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "পুনর্নির্দেশের জন্য USB ডিভাইস নির্বাচন করুন" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "%d ধরনের অনুমোদন সমর্থিত নয়" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "স্ক্রিন-শট" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "সংযোগ বিচ্ছেদ করুন" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB ডিভাইস নির্বাচন" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "সেন্ড-কি-র সংকলন" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "সম্পূর্ণ পর্দায় প্রদর্শন থেকে প্রস্থান" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(পয়েন্টার মুক্ত করার জন্য %s টিপুন)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "এই সংযোগ সেট অাপ করতে অন্ততপক্ষে %s সংস্করণ %s প্রয়োজন" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "গেস্ট ডোমেইন পুনরায় আরম্ভের অপেক্ষা করা হচ্ছে" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "%s গেস্ট মেশিনের জন্য গ্রাফিকের ধরন নির্ধারণ করা সম্ভব নয়" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "%s গেস্ট মেশিনের জন্য গ্রাফিক ঠিকানা নির্ধারণ করা সম্ভব নয়" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "%s গেস্ট মেশিনের জন্য হোস্ট নির্ধারণ করা সম্ভব নয়" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "লিবভার্ট আরম্ভের অপেক্ষা করা হচ্ছে" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "গেস্ট ডোমেইন সন্ধান করা হচ্ছে" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "গেস্ট ডোমেইন প্রস্তুতির অপেক্ষা করা হচ্ছে" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "%s গেস্ট ডোমেইন সন্ধান করতে ব্যর্থ" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "গেস্ট ডোমেইনের অবস্থা পরীক্ষা করতে ব্যর্থ" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "গেস্ট ডোমেইন আরম্ভের অপেক্ষা করা হচ্ছে" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "গেস্ট ডোমেইন দ্বারা সার্ভার আরম্ভের অপেক্ষা করা হচ্ছে" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s সহযোগে libvirt-র সাথে সংযোগ করতে ব্যর্থ" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[শূণ্য]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ফাইল (_F)" @@ -584,30 +707,78 @@ msgid "Smartcard removal" msgstr "স্মার্ট-কার্ড অপসারণ" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "প্রদর্শন (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "সম্পূর্ণ পর্দায় প্রদর্শন" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "প্রদর্শনের নাম (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "প্রদর্শনক্ষেত্র" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "কার্সার মুক্ত করা হবে" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "কি পাঠিয়ে দিন (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "সহায়তা (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/bo.po b/po/bo.po index 6ccd8ea..b1b05bb 100644 --- a/po/bo.po +++ b/po/bo.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Tibetan (http://www.transifex.com/projects/p/virt-viewer/language/bo/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Tibetan\n" +"Language: bo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bo\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/br.po b/po/br.po index b44d631..40034e2 100644 --- a/po/br.po +++ b/po/br.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Breton (http://www.transifex.com/projects/p/virt-viewer/language/br/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Breton\n" +"Language: br\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: br\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/brx.po b/po/brx.po index 1fc9d0a..fd5e7b9 100644 --- a/po/brx.po +++ b/po/brx.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Bodo (http://www.transifex.com/projects/p/virt-viewer/language/brx/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Bodo\n" +"Language: brx\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: brx\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/bs.po b/po/bs.po index 9f4afe2..9776114 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Bosnian (http://www.transifex.com/projects/p/virt-viewer/language/bs/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Bosnian\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bs\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ca.po b/po/ca.po index 4025a61..1e5ec55 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,190 +1,239 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: +# Robert Antoni Buj i Gelonch, 2014 +# Robert Antoni Buj Gelonch , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Catalan (http://www.transifex.com/projects/p/virt-viewer/language/ca/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-12-09 03:08-0500\n" +"Last-Translator: Robert Antoni Buj Gelonch \n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/virt-viewer/" +"language/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" -msgstr "" +msgstr "Visualitzador remot" #: ../data/remote-viewer.desktop.in.h:2 msgid "Access remote desktops" -msgstr "" +msgstr "Accediu a escriptoris remots" #: ../data/virt-viewer-mime.xml.in.h:1 msgid "Virt-Viewer connection file" -msgstr "" +msgstr "Fitxer de connexió Virt-Viewer" #: ../src/gbinding.c:637 msgid "Source" -msgstr "" +msgstr "Origen" #: ../src/gbinding.c:638 msgid "The source of the binding" -msgstr "" +msgstr "L'origen de la creació d'un vincle" #: ../src/gbinding.c:652 msgid "Target" -msgstr "" +msgstr "Destí" #: ../src/gbinding.c:653 msgid "The target of the binding" -msgstr "" +msgstr "El destí de la creació d'un vincle" #: ../src/gbinding.c:668 msgid "Source Property" -msgstr "" +msgstr "Propietat de l'origen" #: ../src/gbinding.c:669 msgid "The property on the source to bind" -msgstr "" +msgstr "La propietat en l'origen per crear un vincle" #: ../src/gbinding.c:684 msgid "Target Property" -msgstr "" +msgstr "Propietat del destí" #: ../src/gbinding.c:685 msgid "The property on the target to bind" -msgstr "" +msgstr "La propietat en el destí per crear un vincle" #: ../src/gbinding.c:699 msgid "Flags" -msgstr "" +msgstr "Indicadors" #: ../src/gbinding.c:700 msgid "The binding flags" -msgstr "" +msgstr "Els indicadors de la creació d'un vincle" #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "remote-viewer versió %s" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 +msgstr "Mostra informació de la versió" + +#: ../src/remote-viewer-main.c:105 msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 +msgstr "Estableix el títol de la finestra" + +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 +msgstr "Obre la connexió mitjançant la comunicació del controlador Spice" + +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Client del visualitzador remot" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" - -#: ../src/remote-viewer-main.c:146 +"%s\n" +"Executeu '%s --help' per visualitzar el llistat complet d'opcions " +"disponibles per a la línia d'ordres\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" - -#: ../src/remote-viewer-main.c:153 +"Error: s'han proporcionat arguments extres mentre s'estava utilitzant el " +"controlador Spice\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +msgstr "S'ha produït un error: no es poden gestionar múltiples URI\n" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 +msgstr "S'ha produït un error en inicialitzar la connexió" + +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 +msgstr "La pantalla està desactivada pel controlador" + +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" +msgstr "La connexió amb el controlador ha fallat: %s" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "_Canvia CD" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "S'ha produït un error en analitzar sintàcticament la uri d'ovirt" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "S'ha cancel·lat l'autenticació" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "La MV oVirt %s no s'està executant" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "La MV oVirt %s no té cap pantalla" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "La MV d'oVirt %s no té cap informació de l'amfitrió" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "La MV oVirt %s té un tipus desconegut de pantalla: %d" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +msgstr "S'està preparant la sessió Spice..." + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "No s'ha seleccionat cap connexió" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "Fitxer no vàlid %s:" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +msgstr "No s'ha pogut determinar el tipus de connexió des de la URI" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "No s'ha pogut obrir la sessió d'oVirt:" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Detalls de la connexió" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "Adreça de connexió" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Per exemple, spice://foo.exemple.cat:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "Connexions recents" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "Cancel·la" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "Connecta" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" -msgstr "" +msgstr "Quant a Glade" #: ../src/virt-viewer-about.xml.h:2 msgid "" "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" msgstr "" +"Un client d'escriptori remot que estigui construït amb GTK-VNC, SPICE-GTK i " +"libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" -msgstr "" +msgstr "virt-manager.org" #: ../src/virt-viewer-about.xml.h:6 msgid "" @@ -202,409 +251,550 @@ "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" msgstr "" +"Aquest programa és programari lliure; el podeu redistribuir i/o modificar\n" +"d'acord amb els termes de la Llicència pública general de GNU tal com\n" +"la publica la Free Software Foundation; amb la versió 2 de la Llicència, o\n" +"(si ho preferiu) amb qualsevol versió posterior.\n" +"\n" +"Aquest programa es distribueix amb l'esperança que us sigui útil, però\n" +"SENSE CAP GARANTIA; ni tan sols amb la garantia de COMERCIALITZACIÓ\n" +"o APTITUD PER A PROPÒSITS DETERMINATS. Vegeu la Llicència pública\n" +"general de GNU per a més detalls.\n" +"\n" +"Hauríeu d'haver rebut una còpia de la llicència pública general de GNU\n" +"amb aquest programa; si no fos així, escriviu a la Free Software\n" +"Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 +msgstr "Robert Antoni Buj i Gelonch " + +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 +msgstr "Voleu tancar la sessió?" + +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 +msgstr "No m'ho tornis a preguntar" + +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +msgstr "A l'espera de la pantalla %d..." + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "Tipus no admès de gràfics «%s»" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 +msgstr "La connexió per ssh ha fallat." + +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 +msgstr "No s'ha pogut connectar al canal, únicament és compatible amb SSH." + +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 +msgstr "La connexió al canal no és compatible." + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "La pantalla únicament pot adjuntar-se a través de libvirt amb --attach" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 +msgstr "S'està connectant al servidor gràfic" + +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 +msgstr "S'ha apagat el domini del convidat" + +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 +msgstr "S'ha connectat al servidor gràfic" + +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 +msgstr "No s'ha pogut connectar amb el servidor gràfic %s" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "No s'ha pogut autenticar amb el servidor d'escriptori remot a %s: %s\n" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "No s'ha pogut autentificar amb el servidor d'escriptori remot: %s" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "S'ha produït un error en la redirecció USB: %s" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "El nivell del zoom ha d'estar dins del rang %d-%d\n" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "Pantalla %d" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "Argument no vàlid de kiosk-quit: %s" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "Nivell de zoom de la finestra, en percentatge" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" +"Obre en mode de pantalla completa (ajusta la resolució del convidat per " +"adaptar-se al client)" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "Personalitza les dreceres de teclat" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "Activa el mode quiosc" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "Surt del mode quiosc en una condició donada" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "Mostra informació detallada" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "Mostra informació de depuració" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" +"Es requereix autentificació per a la connexió %s a:\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "Es requereix autentificació per a la connexió %s:\n" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 +msgstr "Es requereix autenticació" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" -msgstr "" +msgstr "etiqueta" #: ../src/virt-viewer-auth.xml.h:3 msgid "Password:" -msgstr "" +msgstr "Contrasenya:" #: ../src/virt-viewer-auth.xml.h:4 msgid "Username:" -msgstr "" +msgstr "Nom d'usuari:" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "Mostra la contrasenya" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "VNC no proporciona GUID" #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" -msgstr "" +msgstr "%s versió %s\n" #: ../src/virt-viewer-main.c:62 msgid "Direct connection with no automatic tunnels" -msgstr "" +msgstr "Connexió directa sense túnels automàtics" #: ../src/virt-viewer-main.c:64 msgid "Attach to the local display using libvirt" -msgstr "" +msgstr "Adjunta a la pantalla local mitjançant libvirt" #: ../src/virt-viewer-main.c:66 msgid "Connect to hypervisor" -msgstr "" +msgstr "Connecta a l'hipervisor" #: ../src/virt-viewer-main.c:68 msgid "Wait for domain to start" -msgstr "" +msgstr "Espera el domini per iniciar" #: ../src/virt-viewer-main.c:70 msgid "Reconnect to domain upon restart" -msgstr "" +msgstr "Torna a connectar al domini en reiniciar" #: ../src/virt-viewer-main.c:77 msgid "Virt Viewer" -msgstr "" +msgstr "Virt Viewer" #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" msgstr "" +"Executeu '%s --help' per visualitzar el llistat complet d'opcions " +"disponibles per a la línia d'ordres" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "Consola gràfica de la màquina virtual" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" +"\n" +"Ús: %s [OPCIONS] [NOM-DOMINI|ID|UUID]\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" +"\n" +"Cap NOM-DOMINI|ID|UUID es va especificar per a '--wait'\n" +"\n" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "La contrasenya no és vàlida" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 +msgstr "Seleccioneu els dispositius USB per a la redirecció" + +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 +msgstr "El tipus d'autenticació no és compatible %d" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "No s'han trobat màquines virtuals" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "No s'ha triat cap màquina virtual" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 +msgstr "Ctrl+Alt+_ Supr" + +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 +msgstr "Ctrl+Alt+_Retrocés" + +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 +msgstr "Ctrl+Alt+F_1" + +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 +msgstr "Ctrl+Alt+F_2" + +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 +msgstr "Ctrl+Alt+F_3" + +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 +msgstr "Ctrl+Alt+F_4" + +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 +msgstr "Ctrl+Alt+F_5" + +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 +msgstr "Ctrl+Alt+F_6" + +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 +msgstr "Ctrl+Alt+F_7" + +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 +msgstr "Ctrl+Alt+F_8" + +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 +msgstr "Ctrl+Alt+F_9" + +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 +msgstr "Ctrl+Alt+F1_0" + +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 +msgstr "Ctrl+Alt+F11" + +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +msgstr "Ctrl+Alt+F12" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 +msgstr "Captura de pantalla" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "Desconegut" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +msgstr "Desconnecta" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 +msgstr "Selecció del dispositiu USB" + +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +msgstr "Envia una combinació de tecles" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 +msgstr "Deixa la pantalla completa" + +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 +msgstr "Ctrl+Alt" + +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" -msgstr "" +msgstr "(Premeu %s per alliberar el punter)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" -msgstr "" +msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 +msgstr " " + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" +"Com a mínim %s versió %s es requereix per a configurar aquesta connexió, " +"vegeu %s per a més detalls" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 +msgstr "Com a mínim es necessita %s versió %s per preparar aquesta connexió" + +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 +msgstr "A l'espera del domini del convidat per tornar a iniciar" + +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +msgstr "No es pot determinar el tipus de gràfics per al convidat %s" + +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 +msgstr "No s'ha pogut determinar l'amfitrió per al convidat %s" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "El convidat «%s» no és accessible" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "La màquina virtual %s no s'està executant" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 +msgstr "A l'espera de libvirt per iniciar" + +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 +msgstr "S'està cercant el domini del convidat" + +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +msgstr "A l'espera de la creació del domini del convidat" + +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 +msgstr "S'està comprovant l'estat del domini del convidat" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "No es pot obtenir l'estat del convidat" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +msgstr "A l'espera del domini del convidat a iniciar" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "No s'ha pogut connectar a libvirt amb l'URI: %s." + +#: ../src/virt-viewer.c:864 msgid "[none]" -msgstr "" - +msgstr "[cap]" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "L'autentificació ha fallat." + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "No s'ha pogut connectar" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" -msgstr "" +msgstr "_Fitxer" #: ../src/virt-viewer.xml.h:4 msgid "Smartcard insertion" -msgstr "" +msgstr "Inserció d'una targeta intel·ligent" #: ../src/virt-viewer.xml.h:5 msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 +msgstr "Extracció d'una targeta intel·ligent" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "Preferències" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 +msgstr "_Visualitza" + +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 +msgstr "Pantalla completa" + +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 +msgstr "_Zoom" + +#: ../src/virt-viewer.xml.h:10 msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 +msgstr "Pantalles" + +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 +msgstr "Allibera el cursor" + +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 +msgstr "Envia _tecles" + +#: ../src/virt-viewer.xml.h:13 msgid "_Help" -msgstr "" +msgstr "A_juda" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "_Detalls del convidat" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "Detalls del convidat" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "Nom:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "Trieu una màquina virtual" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "Nom" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "Màquines virtuals disponibles" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "Compartició de carpetes" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "Comparteix la carpeta" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "Només lectura" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "Spice" diff --git a/po/cs.po b/po/cs.po index 0db9f70..3e575cd 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Czech (http://www.transifex.com/projects/p/virt-viewer/language/cs/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Czech\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po deleted file mode 100644 index bd4164e..0000000 --- a/po/cs_CZ.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/fedora/language/cs_CZ/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: cs_CZ\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/cy.po b/po/cy.po index 4d1ece7..2551e76 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Welsh (http://www.transifex.com/projects/p/virt-viewer/language/cy/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Welsh\n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cy\n" -"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " +"11) ? 2 : 3\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/da.po b/po/da.po index c2f67f0..1f8aafe 100644 --- a/po/da.po +++ b/po/da.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Danish (http://www.transifex.com/projects/p/virt-viewer/language/da/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Danish\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: da\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/de.po b/po/de.po index 93acbed..6ed7342 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Automatically generated, 2010 # Fabian Affolter , 2012,2014 @@ -13,27 +13,30 @@ # Rainer Gromansperg , 2013 # Roman Spirgi , 2012 # noxin , 2013 +# Roman Spirgi , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: German (http://www.transifex.com/projects/p/virt-viewer/language/de/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-05-26 09:30-0400\n" +"Last-Translator: Roman Spirgi \n" +"Language-Team: German (http://www.transifex.com/projects/p/virt-viewer/" +"language/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Remote-Viewer" #: ../data/remote-viewer.desktop.in.h:2 msgid "Access remote desktops" -msgstr "Zugriff auf Remote-Desktop" +msgstr "Zugriff auf Remote-Desktops" #: ../data/virt-viewer-mime.xml.in.h:1 msgid "Virt-Viewer connection file" @@ -81,103 +84,143 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "Remote-Viewer Version %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Versionsinformationen anzeigen" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Titel des Window setzen" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Verbindung öffnen unter Verwendung der Spice-Kontroller-Kommunikation" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nFühren Sie '%s --help' aus, zum Anzeigen aller verfügbaren Kommandozeilen-Optionen\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Führen Sie '%s --help' aus, zum Anzeigen aller verfügbaren Kommandozeilen-" +"Optionen\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Fehler: Zusätzliche Parameter bei Verwendung von Spice-Controller angegeben\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Fehler: Zusätzliche Parameter bei Verwendung von Spice-Controller angegeben\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Fehler: Multiple URIs können nicht verarbeitet werden\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Initiieren der Verbindung fehlgeschlagen" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Anzeige vom Kontroller deaktiviert" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Kontroller-Verbindung fehlgeschlagen: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Verbindungsdetails" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Spice-Sitzung konnte nicht erstellt werden" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Einrichten der Spice-Sitzung ..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Ungültige Datei %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Verbindungstyp konnte nicht von URI ermittelt werden" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt Sitzung konnte nicht geöffnet werden" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Sitzung für diesen Typ konnte nicht erstellt werden: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Verbindungsdetails" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Über Glade" @@ -190,7 +233,9 @@ #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Ein Remote-Desktop-Client erstellt unter Verwendung von GTK-VNC, SPICE-GTK und libvirt" +msgstr "" +"Ein Remote-Desktop-Client erstellt unter Verwendung von GTK-VNC, SPICE-GTK " +"und libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -211,133 +256,167 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Das Fedora Übersetzungs-Team" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Möchten Sie die Sitzung beenden?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Nicht noch einmal nachfragen" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Warten auf Anzeige %d ..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Unbekannter Grafiktyp für Gast %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Verbindung über SSH ist fehlgeschlagen." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." -msgstr "Zu dem Kanal konnte nicht verbunden werden, es wird nur SSH unterstützt" - -#: ../src/virt-viewer-app.c:1041 +msgstr "" +"Zu dem Kanal konnte nicht verbunden werden, es wird nur SSH unterstützt" + +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Verbindung zu dem Kanal wird nicht unterstützt." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Verbinden mit Grafikserver" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Gast-Domain wurde beendet" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Verbunden mit Grafikserver" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Verbindung zum Grafik-Server %s konnte nicht hergestellt werden" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Authentifikation beim Remote-Desktop-Server unter %s fehlgeschlagen: %s\nVerbindung erneut versuchen?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Authentifikation beim Remote-Desktop-Server fehlgeschlagen: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB-Weiterleitungsfehler: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Zoom-Level muss zwischen %d-%d sein\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d anzeigen" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Ungültiger kiosk-quit Parameter: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Zoomlevel des Fensters in Prozent" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Im Vollbildmodus öffnen (Die Auflösung des Gast-Systems entsprechend angepasst an)." - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Im Vollbildmodus öffnen (Die Auflösung des Gast-Systems entsprechend " +"angepasst an)." + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "eigene angepasste Hotkeys" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Kiosk Modus ermöglichen" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Beenden bei bestimmter Bedingung im Kiosk-Modus" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Ausführliche Informationen anzeigen" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Debugging-Informationen anzeigen" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Authentifikation erforderlich" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "Label" @@ -349,6 +428,14 @@ msgid "Username:" msgstr "Benutzername:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -381,204 +468,244 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Führen Sie '%s --help' aus, zum Anzeigen aller verfügbaren Kommandozeilen-Optionen" +msgstr "" +"Führen Sie '%s --help' aus, zum Anzeigen aller verfügbaren Kommandozeilen-" +"Optionen" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nVerwendung: %s [OPTIONEN] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "Ungültiges Passwort" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "USB-Gerät zur Weiterleitung wählen" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Nicht unterstützter Authentifikationsstyp %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Strg+Alt+_Entf" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Strg+Alt+_Rücktaste" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Strg+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Strg+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Strg+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Strg+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Strg+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Strg+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Strg+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Strg+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Strg+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Strg+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Strg+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Strg+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Screenshot" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Verbindung trennen" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB-Geräteauswahl" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Tastenkombination senden" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Vollbildmodus verlassen" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Strg+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Drücken Sie %s, um den Mauszeiger freizugeben)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" -msgstr "Es wird mindestens %s in der Version %s benötigt, um eine Verbindung aufzubauen" - -#: ../src/virt-viewer.c:133 +msgstr "" +"Es wird mindestens %s in der Version %s benötigt, um eine Verbindung " +"aufzubauen" + +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Warten auf Neustart der Domain" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Grafiktyp für den Gast %s konnte nicht ermittelt werden " -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Grafikadresse für den Gast %s konnte nicht ermittelt werden " - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Host für den Gast %s konnte nicht ermittelt werden" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Auf den Start von libvirt wird gewartet" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Suchen der Gast-Domain" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Warten auf Erstellung der Gast-Domain" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Gast-Domain %s konnte nicht gefunden werden" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Prüfen des Gast-Domain-Status" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Warten auf Start der Gast-Domain" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Warten, bis Gast-Domain den Server startet" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Verbindung zu libvirt mit URI %s konnte nicht hergestellt werden" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[keine]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Datei" @@ -591,30 +718,78 @@ msgid "Smartcard removal" msgstr "Smartcard-Entfernung" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Ansicht" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Vollbild" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Zoom" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Anzeigen" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Cursor freigeben" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Taste senden" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Hilfe" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/de_CH.po b/po/de_CH.po index 3d9f719..8ab979f 100644 --- a/po/de_CH.po +++ b/po/de_CH.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/virt-viewer/language/de_CH/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: German (Switzerland)\n" +"Language: de-CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de_CH\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/dz.po b/po/dz.po deleted file mode 100644 index eef5a91..0000000 --- a/po/dz.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Dzongkha (http://www.transifex.com/projects/p/virt-viewer/language/dz/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: dz\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/el.po b/po/el.po index bc9b1cd..3960ea1 100644 --- a/po/el.po +++ b/po/el.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Greek (http://www.transifex.com/projects/p/virt-viewer/language/el/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Greek\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 474c4ca..fead5ef 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/virt-viewer/language/en_GB/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: English (United Kingdom)\n" +"Language: en-GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/en_US.po b/po/en_US.po deleted file mode 100644 index e79b22f..0000000 --- a/po/en_US.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: English (United States) (http://www.transifex.com/projects/p/virt-viewer/language/en_US/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: en_US\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/eo.po b/po/eo.po index 64854f0..999d8d2 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Esperanto (http://www.transifex.com/projects/p/virt-viewer/language/eo/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Esperanto\n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eo\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/es.po b/po/es.po index e8d9541..7cab4b1 100644 --- a/po/es.po +++ b/po/es.po @@ -1,33 +1,37 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# Adolfo Jayme Barrientos , 2012 +# Adolfo Jayme Barrientos , 2012 # vareli , 2013-2014 # vareli , 2013 +# Gerardo Rosales , 2014 # Gladys Guerrero , 2012 # Gladys Guerrero , 2012-2013 # Luis Bazán , 2013 # Manuel Eduardo Ospina Sarmiento , 2010 # Manuel Ospina , 2010 +# Abdel G. Martínez L. , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/virt-viewer/language/es/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-04-17 10:00-0400\n" +"Last-Translator: Abdel G. Martínez L. \n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/virt-viewer/" +"language/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" -msgstr "Visor remoto" +msgstr "Visor Remoto" #: ../data/remote-viewer.desktop.in.h:2 msgid "Access remote desktops" @@ -55,7 +59,7 @@ #: ../src/gbinding.c:668 msgid "Source Property" -msgstr "Propiedad de fuente" +msgstr "Propiedad de la Fuente" #: ../src/gbinding.c:669 msgid "The property on the source to bind" @@ -63,7 +67,7 @@ #: ../src/gbinding.c:684 msgid "Target Property" -msgstr "Propiedad de destino" +msgstr "Propiedad de Destino" #: ../src/gbinding.c:685 msgid "The property on the target to bind" @@ -79,103 +83,146 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer versión %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Mostrar información de versión" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Fijar el título de ventana" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Abra la conexión mediante el controlador de comunicación Spice " -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Cliente de visor remoto" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s Corriendo ‘%s –help’ para ver una lista completa de las opciones disponibles de línea de comando\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"Ejecute '%s --help' para ver una lista completa de opciones de línea de " +"comandos disponibles\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Error: argumentos adicionales proporcionados mediante el controlador de Spice\n\n\n\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Error: argumentos adicionales proporcionados mediante el controlador de " +"Spice\n" +"\n" +"\n" +"\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" -msgstr "Error: no se puede manipular URl\n" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +msgstr "Error: no se puede manipular múltiples URIs\n" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "No se pudo inicializar la conexión" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Pantalla desactivada por el controlador" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "No se pudo conectar al controlador: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Información de conexión" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "_Cambiar CD" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "fallo en análisis uri de ovirt" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "la MV oVirt %s no está ejecutándose" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "la MV oVirt %s no tiene monitor" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "No se pudo crear una sesión de Spice" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "la MV oVirt %s tiene un tipo de monitor desconocido: %d" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Configurando sesión de Spice…" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Fichero no válido %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "No se puede determinar el tipo de conexión de la URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "No se pudo abrir la sesión oVirt" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "No se pudo crear una sesión para este tipo: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Detalles de conexión" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Por ejemplo, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Acerca de Glade" @@ -185,10 +232,13 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Un cliente de escritorio remoto creado con GTK-VNC, SPICE-GTK y libvirt" +msgstr "" +"Un cliente de escritorio remoto creado con GTK-VNC, SPICE-GTK y libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -209,133 +259,170 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Este programa es de software libre; puede distribuirlo y modificarlo bajo los términos de la Licencia Pública General de GNU publicada por la Free Software Foundation, ya sea la versiṕn 2 de la licencia o (su opción) una versión posterior.\n\nEste programa se distribuye con la esperanza de que será útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de comerciabilidad o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Ver la GNU General Public License para más detalles. ⏎ \n\nDebe de haber recibido una copia de la Licencia Pública General de GNU junto con este programa, si no, escriba a la Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 EE.UU. \n" +msgstr "" +"Este programa es de software libre; puede distribuirlo y modificarlo bajo " +"los términos de la Licencia Pública General de GNU publicada por la Free " +"Software Foundation, ya sea la versiṕn 2 de la licencia o (su opción) una " +"versión posterior.\n" +"\n" +"Este programa se distribuye con la esperanza de que será útil, pero SIN " +"NINGUNA GARANTÍA, incluso sin la garantía implícita de comerciabilidad o " +"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Ver la GNU General Public License " +"para más detalles. \n" +"\n" +"Debe de haber recibido una copia de la Licencia Pública General de GNU junto " +"con este programa, si no, escriba a la Free Software Foundation, Inc., 59 " +"Temple Place, Suite 330, Boston, MA 02111-1307 EE.UU. \n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" -msgstr "El equipo de traducción de Fedora" - -#: ../src/virt-viewer-app.c:400 +msgstr "El Equipo de Traducción de Fedora" + +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "¿Quiere cerrar la sesión?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "No me pregunte otra vez" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." -msgstr "Esperando la pantalla %d…" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Tipo de gráficos desconocido para el huésped %s" - -#: ../src/virt-viewer-app.c:1027 +msgstr "Esperando el monitor %d…" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Falló la conexión a ssh." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "No se puede conectar al canal, solo se permite SSH." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "La conexión al canal no está soportada." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "La pantalla solo puede ser unida a través de libvirt con --attach" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Conectando al servidor gráfico" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Dominio de huéspedes se ha apagado" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Conectado al servidor gráfico" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "No se pudo conectar al servidor gráfico %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "No se puede autenticar con el servidor de escritorio remoto en %s: %s⏎ \n¿Reintentar la conexión?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "No se puede autenticar con el servidor del escritorio remoto: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Error de redirección USB: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" -msgstr "Nivel de zoom debe estar dentro de %d-%d\n" - -#: ../src/virt-viewer-app.c:2126 +msgstr "Nivel de enfoque debe estar dentro de %d-%d\n" + +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" -msgstr "Visualizar %d" - -#: ../src/virt-viewer-app.c:2301 +msgstr "Monitor %d" + +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Argumento kiosk-quit no válido: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" -msgstr "Aumentar acercamiento de ventana, en porcentaje" - -#: ../src/virt-viewer-app.c:2312 +msgstr "Nivel de enfoque de ventana, en porcentaje" + +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Abrir en modo pantalla completa (ajuste la resolución del invitado para que encaje con el cliente)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Abrir en modo pantalla completa (ajusta la resolución del invitado para que " +"encaje con el cliente)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Personalizar teclas calientes" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" -msgstr "Activar el modo kiosk" - -#: ../src/virt-viewer-app.c:2318 +msgstr "Activar el modo kiosco" + +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" -msgstr "Abandonar sobre condición dada en modo kiosk" - -#: ../src/virt-viewer-app.c:2318 +msgstr "Abandonar sobre condición dada en modo kiosco" + +#: ../src/virt-viewer-app.c:2569 msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 +msgstr "" + +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Mostrar información detallada" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Mostrar información de depuración" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" +"Autenticación es requerida para la conexión %s para:\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "Autenticación es requerida para la conexión %s:\n" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" -msgstr "Se necesita autenticación" - -#: ../src/virt-viewer-auth.xml.h:2 +msgstr "Autenticación requerida" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "etiqueta" @@ -347,6 +434,14 @@ msgid "Username:" msgstr "Nombre de usuario:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "Mostrar contraseña" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -379,240 +474,326 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Corriendo ‘%s –help’ para ver una lista completa de las opciones disponibles de línea de comando" +msgstr "" +"Ejecutando ‘%s –help’ puede ver una lista completa de las opciones " +"disponibles de líneas de comando" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "Consola gráfica de la máquina virtual" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nUso: %s [OPCIONES] DOMINIO-NOMBRE|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "contraseña no válida" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "Contraseña inválida" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Seleccione los dispositivos USB para redirigir" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Tipo de autenticación no compatible %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "Máquina virtual no encontrada" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Supr" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Retroceso" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Captura de pantalla" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "Desconocido" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Desconectar" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Selección de dispositivos USB" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Enviar combinación de teclas" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Salir de pantalla completa" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Presione %s para liberar el puntero)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" -msgstr "Por lo menos %s versión %s se requiere para configurar esta conexión" - -#: ../src/virt-viewer.c:133 +msgstr "Al menos la %s versión %s es requerida para configurar esta conexión" + +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Esperando a que el dominio de huéspedes reinicie" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "No se puede determinar el tipo de gráficos para el huésped %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "No se puede determinar la dirección de gráficos para el huésped %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "No se puede determinar el anfitrión para el huésped %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "Huésped '%s' no está alcanzable" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "Máquina virtual %s no está en ejecución" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Esperando a libvirt para inicio" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Buscando dominio de huéspedes" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Esperando a que el dominio de huéspedes sea creado" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "No se pudo encontrar el dominio huésped %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Comprobando el estatus del dominio de huéspedes" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Esperando a que dominio de huéspedes inicie" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Esperando a que el servidor del dominio de huéspedes inicie" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "No se pudo conectar a libvirt con el URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "No puede conectarse a libvirt con URI: %s." + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[ninguno]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "Fallo de autenticación." + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" -msgstr "_Archivo" +msgstr "_Fichero" #: ../src/virt-viewer.xml.h:4 msgid "Smartcard insertion" -msgstr "Inserción de Smartcard" +msgstr "Inserción de smartcard" #: ../src/virt-viewer.xml.h:5 msgid "Smartcard removal" -msgstr "Retiro de Smartcard" - -#: ../src/virt-viewer.xml.h:6 +msgstr "Retiro de smartcard" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Ver" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Pantalla completa" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" -msgstr "_Zoom" - -#: ../src/virt-viewer.xml.h:9 +msgstr "_Enfoque" + +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Pantallas" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" -msgstr "Libere el cursor" - -#: ../src/virt-viewer.xml.h:11 +msgstr "Liberar cursor" + +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Enviar llave" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" -msgstr "Ay_uda" +msgstr "_Ayuda" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "_Detalles de Huésped" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "Detalles de Huésped" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "Nombre:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "Elija una máquina virtual" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "Nombre" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "Máquinas virtuales disponibles" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po deleted file mode 100644 index ea4aaaa..0000000 --- a/po/es_ES.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/fedora/language/es_ES/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es_ES\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/et.po b/po/et.po index 81a7d34..c495f85 100644 --- a/po/et.po +++ b/po/et.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Estonian (http://www.transifex.com/projects/p/virt-viewer/language/et/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Estonian\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/eu.po b/po/eu.po index 0d7e126..2951e3b 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Asier Iturralde Sarasola , 2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Basque (http://www.transifex.com/projects/p/virt-viewer/language/eu/)\n" +"Language-Team: Basque (http://www.transifex.com/projects/p/virt-viewer/" +"language/eu/)\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -72,103 +74,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Bistaratu bertsio informazioa" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade-ri buruz" @@ -208,127 +246,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Bistaratu arazketa informazioa" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "etiketa" @@ -340,6 +396,14 @@ msgid "Username:" msgstr "Erabiltzaile-izena:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -378,198 +442,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Pantaila-argazkia" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Deskonektatu" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB gailuaren hautapena" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Irten pantaila osotik" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Fitxategia" @@ -582,30 +682,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Ikusi" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Pantaila osoa" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Zooma" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Bidali tekla" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Laguntza" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po deleted file mode 100644 index 55a9183..0000000 --- a/po/eu_ES.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/fedora/language/eu_ES/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: eu_ES\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/fa.po b/po/fa.po index 1c6d7a5..3c3b4bc 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Persian (http://www.transifex.com/projects/p/virt-viewer/language/fa/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Persian\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fa\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/fa_IR.po b/po/fa_IR.po deleted file mode 100644 index 2b1e758..0000000 --- a/po/fa_IR.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/fedora/language/fa_IR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fa_IR\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/fi.po b/po/fi.po index cc69801..214d2ff 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Finnish (http://www.transifex.com/projects/p/virt-viewer/language/fi/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Finnish\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fi\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/fr.po b/po/fr.po index 57baf90..66704e2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,28 +1,30 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Boris BARNIER , 2010 # Christophe Fergeau , 2013 -# Gé Baylard , 2014 +# Gé Baylard , 2014 # Jérôme Fenal , 2012-2013 # Sam Friedmann , 2010,2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: French (http://www.transifex.com/projects/p/virt-viewer/language/fr/)\n" +"Language-Team: French (http://www.transifex.com/projects/p/virt-viewer/" +"language/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Afficheur distant" @@ -76,103 +78,145 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer version %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Afficher les informations de version" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Définir le titre de la fenêtre" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" -msgstr "Ouvrir la connexion à l'aide d'une communication avec le contrôleur de Spice" - -#: ../src/remote-viewer-main.c:116 +msgstr "" +"Ouvrir la connexion à l'aide d'une communication avec le contrôleur de Spice" + +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nLancer '%s --help' pour voir la liste complète des options de ligne de commande disponibles.\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Lancer '%s --help' pour voir la liste complète des options de ligne de " +"commande disponibles.\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Erreur : arguments surnuméraires spécifiés lors de l'utilisation du contrôleur Spice\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Erreur : arguments surnuméraires spécifiés lors de l'utilisation du " +"contrôleur Spice\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Erreur : impossible de gérer plusieurs URI\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Impossible d'initier la connexion" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Affichage désactivé par le contrôleur" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Échec de la connexion du contrôleur : %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Détails de la connexion" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Impossible de créer une session Spice" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Mise en place d'une session Spice..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Fichier invalide: %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Impossible de déterminer le type de la connexion à partir de l'URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Impossible de créer une session oVirt" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Impossible de créer une session pour ce type : %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Détails de la connexion" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "À propos de Glade" @@ -206,133 +250,168 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "L'équipe de traduction de Fedora" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Êtes-vous sûr de vouloir mettre fin à la session?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Ne plus demander" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "En attente de l'affichage %d..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Type d'affichage inconnu de l'invité %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Échec de la connexion ssh." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." -msgstr "Impossible d'établir la connexion au canal, seul SSH est pris en charge." - -#: ../src/virt-viewer-app.c:1041 +msgstr "" +"Impossible d'établir la connexion au canal, seul SSH est pris en charge." + +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "La connexion au canal n'est pas prise en charge." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Connexion au serveur d'affichage" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Le domaine invité est fermé" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Connecté au serveur d'affichage" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Impossible d'établir la connexion au serveur d'affichage %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Authentification avec le serveur distant sur %s impossible : %s\nEssayer la connexion à nouveau ?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" -msgstr "Impossible d'authentifier la connexion avec le serveur de bureau distant : %s" - -#: ../src/virt-viewer-app.c:1404 +msgstr "" +"Impossible d'authentifier la connexion avec le serveur de bureau distant : %s" + +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Erreur de redirection USB : %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Le niveau de zoom doit être dans la plage %d-%d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Affichage %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Argument kiosk-quit invalide : %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Niveau de zoom de la fenêtre, en pourcentage" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Ouvre en mode plein écran (ajuste la résolution de l'invité à celle du client)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Ouvre en mode plein écran (ajuste la résolution de l'invité à celle du " +"client)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Personnaliser les raccourcis clavier" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Activer le mode kiosque" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Quitter sur une condition définie dans le mode kiosque" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Afficher les informations détaillées" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Afficher les informations de débogage" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Authentification requise" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "étiquette" @@ -344,6 +423,14 @@ msgid "Username:" msgstr "Nom d'utilisateur :" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -376,204 +463,242 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Lancer '%s --help' pour voir la liste complète des options de ligne de commande disponibles." +msgstr "" +"Lancer '%s --help' pour voir la liste complète des options de ligne de " +"commande disponibles." #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nUsage : %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "mot de passe invalide" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Sélectionnez les périphériques USB à rediriger" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Le type d'authentification %d n'est pas pris en charge" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Suppr" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Effacer" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Capture d'écran" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Déconnexion" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Sélection du périphérique USB" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Envoyer la combinaison de touches" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Quitter le plein écran" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Appuyer sur %s pour libérer la souris)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "La configuration de cette connexion nécessite au minimum %s version %s" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "En attente du redémarrage du domaine invité" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Impossible de déterminer le type d'affichage de l'invité %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Impossible de déterminer l'adresse de l'affichage de l'invité %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Impossible de déterminer l'hôte de l'invité %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "En attente du démarrage de libvirt" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Recherche du domaine invité" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "En attente de la création du domaine invité" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Impossible de trouver le domaine invité %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Vérification du statut du domaine invité" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "En attente du démarrage du domaine invité" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "En attente du démarrage du serveur par le domaine invité" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Impossible de se connecter à libvirt avec URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[aucun]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Fichier" @@ -586,30 +711,78 @@ msgid "Smartcard removal" msgstr "Suppression d'une Smartcard" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Affichage" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Plein écran" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Zoom" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Affichages" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Libérer le curseur" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Envoi de touches" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Aide" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ga.po b/po/ga.po deleted file mode 100644 index 2cba6ab..0000000 --- a/po/ga.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Irish (http://www.transifex.com/projects/p/virt-viewer/language/ga/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ga\n" -"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/gl.po b/po/gl.po index 764d5f6..a418184 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Galician (http://www.transifex.com/projects/p/virt-viewer/language/gl/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Galician\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gl\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/gu.po b/po/gu.po index 0a80ce2..13f7c68 100644 --- a/po/gu.po +++ b/po/gu.po @@ -1,26 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Ankit Patel , 2014 # sweta , 2010,2012-2013 -# sweta , 2013 +# sweta , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Gujarati (http://www.transifex.com/projects/p/virt-viewer/language/gu/)\n" +"Language-Team: Gujarati (http://www.transifex.com/projects/p/virt-viewer/" +"language/gu/)\n" +"Language: gu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "દૂરસ્થ દર્શક" @@ -74,103 +76,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer આવૃત્તિ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "આવૃત્તિ જાણકારીને બતાવો" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "વિન્ડો શીર્ષક સુયોજિત કરો" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Spice નિયંત્રક વાર્તાલાપની મદદથી જોડાણને ખોલો" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "- દૂરસ્થ દર્શક ક્લાયન્ટ" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nઉપલબ્ધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદીને જોવા માટે '%s --help' ચલાવો\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"ઉપલબ્ધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદીને જોવા માટે '%s --help' ચલાવો\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "ભૂલ: વધારાની દલીલો આપેલ છે જ્યારે Spice નિયંત્રકને વાપરી રહ્યા હોય\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "ભૂલ: ઘણી URIs ને સંભાળી શકાતી નથી\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "જોડાણને પ્રારંભ કરવાનુ નિષ્ફળ" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "નિયંત્રક દ્દારા નિષ્ક્રિય થયેલ બતાવો" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "નિયંત્રક જોડાણ નિષ્ફળ: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "જોડાણ વિગતો" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Spice સત્રને બનાવી શક્યા નહિં" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice સત્રને સુયોજિત કરી રહ્યા છે..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "અયોગ્ય ફાઇલ %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI માંથી જોડાણ પ્રકારને નક્કી કરી શકાતુ નથી" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt સત્રને ખોલી શક્યા નહિં" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "આ પ્રકાર માટે સત્રને બનાવી શક્યા નહિં: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "જોડાણ વિગતો" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "ઉદાહરણ તરીકે, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "ગલૅડ વિશે" @@ -180,6 +220,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -204,133 +246,164 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora અનુવાદ ટીમ" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "શું તમે આ સત્રને બંધ કરવા માંગો છો?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "મને ફરી વાર પૂછશો નહિં" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "%d ને દર્શાવવા માટે રાહ જોઇ રહ્યા છે..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "મહેમાન %s માટે અજ્ઞાત ગ્રાફિક પ્રકાર" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh સાથે જોડાવાનું નિષ્ફળ." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "ચેનલમાં જોડાઇ શકતા નથી, SSH ફક્ત આધારભૂત છે." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "ચેનલમાં જોડાવાનુ બિનઆધારભૂત છે." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "ગ્રાફિક સર્વરમાં જોડાઇ રહ્યા છે" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "મહેમાન ડોમેઇન બંધ થઇ ગયો" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "ગ્રાફિક સર્વરમાં જોડાયેલ છે" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "ગ્રાફિક સર્વર %s માં જોડાવામાં અસમર્થ" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s પર દૂરસ્થ ડેસ્કટોપ સાથે સત્તાધિકરણ કરવાનું અસમર્થ: %s\nફરીથી જોડાણનો પુન:પ્રયત્ન કરો?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "દૂરસ્થ ડેસ્કટોપ સર્વર સાથે સત્તાધિકરણ કરવાનું અસમર્થ: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB પુનર્નિર્દેશન ભૂલ: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "નાનું મોટુ કરવાનું લેવલ એ %d-%d માં હોવુ જ જોઇએ\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d દર્શાવો" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "અયોગ્ય kiosk-quit દલીલ: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "નાનામોટાપણાનું સ્તર, ટકામાં" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "સંપૂર્ણ સ્ક્રીન સ્થિતિમાં ખોલો (ક્લાયન્ટને બંધબેસાડવા માટે મહેમાન રિઝોલ્યુશનને ગોઠવે છે)" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "ટૂંકીકીઓ કસ્ટમાઇઝ કરો" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "kiosk સ્થિતિને સક્રિય કરો" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "kiosk સ્થિતિમાં આપેલ શરત પર બહાર નીકળો" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "વર્બોસ જાણકારીને બતાવો" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ડિબગીંગ જાણકારીને બતાવો" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "સત્તાધિકરણ જરૂરી છે" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "લેબલ" @@ -342,6 +415,14 @@ msgid "Username:" msgstr "વપરાશકર્તાનામ:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -378,200 +459,236 @@ #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "વર્ચ્યુઅલ મશીન ગ્રાફિકલ કન્સોલ" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nવપરાશ: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "અયોગ્ય પાસવર્ડ" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "પુનર્નિર્દેશન માટે USB ઉપકરણોને પસંદ કરો" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "બિનઆધારભૂત સત્તાધિકરણ પ્રકાર %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "સ્ક્રીનશોટ" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "જોડાણ તોડી નાંખો" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB ઉપકરણ પસંદગી" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "કી સંયોજન મોકલો" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "પૂર્ણસ્ક્રીન છોડો" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(પોઇંટરને પ્રકાશિત કરવા માટે %s ને દબાવો)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "ઓછામાં ઓછી %s આવૃત્તિ %s ને આ જોડાણને સુયોજિત કરવાની જરૂરિયાત છે" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "પુન:શરૂ કરવા માટે મહેમાન ડોમેઇન માટે રાહ જોઇ રહ્યા છે" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "મહેમાન %s માટે ગ્રાફિક પ્રકારને નક્કી કરી શકાતુ નથી" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "મહેમાન %s માટે ગ્રાફિક સરનામાંને નક્કી કરી શકાતુ નથી" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "મહેમાન %s માટે યજમાનને નક્કી કરી શકાતુ નથી" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "શરૂ થવા libvirt માટે રાહ જોઇ રહ્યા છે" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "મહેમાન ડોમેઇનને શોધી રહ્યા છે" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "બનાવવા માટે મહેમાન ડોમેઇન માટે રાહ જોઇ રહ્યા છે" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "મહેમાન ડોમેઇન %s ને શોધી શકાતુ નથી" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "મહેમાન ડોમેઇન પરિસ્થિતિને ચકાસી રહ્યા છે" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "શરૂ કરવા માટે મહેમાન ડોમેઇન માટે રાહ જોઇ રહ્યા છે" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "સર્વરને શરૂ કરવા માટે મહેમાન ડોમેઇન માટે રાહ જોઇ રહ્યા છે" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s સાથે libvirt ને જોડવાનું અસમર્થ" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[કંઇ નહિં]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ફાઇલ (_F)" @@ -584,30 +701,78 @@ msgid "Smartcard removal" msgstr "સ્માર્ટકાર્ડ નિરાકરણ" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "દૃશ્ય (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "પૂર્ણ સ્ક્રીન" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "નાનુંમોટુ કરો (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "દર્શાવે છે" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "પ્રકાશન કર્સર" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "કી મોકલો (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "મદદ (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/he.po b/po/he.po index aba1d29..4c53eb4 100644 --- a/po/he.po +++ b/po/he.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/virt-viewer/language/he/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Hebrew\n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/hi.po b/po/hi.po index c6cc362..0acc2d6 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Chandan kumar , 2012 # rajesh , 2012 @@ -9,19 +9,21 @@ # Rajesh Ranjan , 2012-2013 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Hindi (http://www.transifex.com/projects/p/virt-viewer/language/hi/)\n" +"Language-Team: Hindi (http://www.transifex.com/projects/p/virt-viewer/" +"language/hi/)\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "दूरस्थ दर्शक" @@ -75,103 +77,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "दूरस्थ-दर्शक संस्करण %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "संस्करण की जानकारी दिखाता है" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "विंडो शीर्षक सेट करें" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "स्पाइस संचार नियंत्रक का उपयोग करते हुए कनेक्शन खोलें" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\n'%s --help' को उपलब्ध कमांड लाइन की पूरी सूची देखने के लिए देखें.\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"'%s --help' को उपलब्ध कमांड लाइन की पूरी सूची देखने के लिए देखें.\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "त्रुटि: स्पाइस कंट्रोलर के उपयोग के दौरान अतिरिक्त वितर्क दिए गए\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "त्रुटि: बहुल URI को नियंत्रित नहीं कर सकता है\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "कनेक्शन आरंभ करने में विफल" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "नियंत्रक के द्वारा प्रदर्शन अक्षम" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "नियंत्रक कनेक्शन में विफल रहा है : %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "संबंध विवरण" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "स्पाइस का सत्र नहीं बना पाया" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "स्पाइस सत्र की सेटिंग कर रहा है ..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "अवैध फ़ाइल %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "यूआरआइ से कनेक्शन के प्रकार को तय नहीं कर सकता है" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "ओवर्ट सत्र खोल नहीं सका" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "इस प्रकार का सत्र नहीं बना सका : %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "संबंध विवरण" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "ग्लेड के बारे में" @@ -205,133 +245,162 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "यह प्रोग्राम मुफ्त सॉफ्टवेयर का है: आप इसे फ्री सॉफ्टवेयर फाउंडेशन के द्वारा प्रकाशित जीएनयू जनरल पब्लिक लाइसेंस; या तो लाइसेंस का संस्करण 2, या (आपके विकल्प के अनुसार) बाद के किसी संस्करण की शर्तों के तहत पुनर्वितरित और / संशोधित कर सकते हैं .\n\nइस कार्यक्रम को इस उम्मीद से वितरित किया गया है कि यह बिना किसी वारंटी;व्यापारिकता की अप्रत्यक्ष वारंटी या किसी खास उद्देश्य के लिए उपयुक्तता के बिना उपयोगी होगा. अधिक जानकारी के लिए जीएनयू जनरल पब्लिक लाइसेंस देखें.\n\nआप इस प्रोग्राम के साथ जीएनयू जनरल पब्लिक लाइसेंस की एक प्रतिलिपि प्राप्त करेगे; अगर नहीं, फ्री सॉफ्टवेयर फाउंडेशन को लिखे, Inc. 59 मंदिर प्लेस, 330 सूट, बोस्टन, एमए 02111-1307, संयुक्त राज्य अमेरिका\n" +msgstr "" +"यह प्रोग्राम मुफ्त सॉफ्टवेयर का है: आप इसे फ्री सॉफ्टवेयर फाउंडेशन के द्वारा प्रकाशित जीएनयू " +"जनरल पब्लिक लाइसेंस; या तो लाइसेंस का संस्करण 2, या (आपके विकल्प के अनुसार) बाद के किसी " +"संस्करण की शर्तों के तहत पुनर्वितरित और / संशोधित कर सकते हैं .\n" +"\n" +"इस कार्यक्रम को इस उम्मीद से वितरित किया गया है कि यह बिना किसी वारंटी;व्यापारिकता " +"की अप्रत्यक्ष वारंटी या किसी खास उद्देश्य के लिए उपयुक्तता के बिना उपयोगी होगा. अधिक " +"जानकारी के लिए जीएनयू जनरल पब्लिक लाइसेंस देखें.\n" +"\n" +"आप इस प्रोग्राम के साथ जीएनयू जनरल पब्लिक लाइसेंस की एक प्रतिलिपि प्राप्त करेगे; अगर " +"नहीं, फ्री सॉफ्टवेयर फाउंडेशन को लिखे, Inc. 59 मंदिर प्लेस, 330 सूट, बोस्टन, एमए " +"02111-1307, संयुक्त राज्य अमेरिका\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "फेडोरा अनुवाद टीम" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "क्या आप इस सत्र को आयात बंद करना चाहते हैं?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "मुझे फिर मत पूछें" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr " %d प्रदर्शन के लिए प्रतीक्षा कर रहा है ..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "%s अतिथि के लिए अज्ञात ग्राफ़िक प्रकार" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "सश से कनेक्ट करने में विफल." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "चैनल से कनेक्ट नहीं हो सकता, केवल सश समर्थित." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr " चैनल से कनेक्ट करना असहायक" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "ग्राफ़िक सर्वर से कनेक्ट हो रहा है." -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "अतिथि के डोमेन को शटडाउन किया है" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "ग्राफ़िक सर्वर से जुड़ा" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "%s ग्राफ़िक सर्वर से कनेक्ट करने में असमर्थ" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s पर दूरस्थ डेस्कटॉप सर्वर के साथ सत्यापन करने में असमर्थ : %s\nफिर से कनेक्शन पुन: प्रयास करें?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "दूरस्थ डेस्कटॉप सर्वर के साथ सत्यापन करने में असमर्थ : %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "यूएसबी पुनर्निर्देशन त्रुटि : %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "प्रदर्शन %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "विंडो का जूम स्तर, प्रतिशत में" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "हॉटकी मनपसंद बनाएँ" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr " वर्बोज की जानकारी दिखाता है" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "डिबगिंग सूचना दिखाता है" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "सत्यापन की आवश्यकता" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "लेबल" @@ -343,6 +412,14 @@ msgid "Username:" msgstr "उपयोगकर्ता नाम:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -381,198 +458,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nप्रयोग: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "पुनर्निर्देशन के लिए यूएसबी उपकरणों का चयन करें" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "असहायक सत्यापन के प्रकार %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "स्क्रीनशॉट" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "डिस्कनेक्ट करें" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "यूएसबी उपकरण चयन" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "कुंजी संयोजन भेजें" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "फुल स्क्रीन छोड़ दें" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(सूचक जारी करने के लिए %s दबाएँ)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "कम से कम %s संस्करण %s इस कनेक्शन के सेटअप के लिए जरूरी है" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "अतिथि डोमेन को फिर से प्रारंभ करने के लिए प्रतीक्षा करे " -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "%s अतिथि के लिए ग्राफ़िक प्रकार निर्धारित नहीं कर सकते है " -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "%s अतिथि के लिए ग्राफ़िक पता निर्धारित नहीं कर सकते है " - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "%s अतिथि के लिए होस्ट का निर्धारण नहीं कर सकते है " -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt शुरू करने के लिए प्रतीक्षा की जा रही है" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "अतिथि डोमेन को खोज रहा है " -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "अतिथि डोमेन बनाई जाने प्रतीक्षा के लिए की जा रही है" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "अतिथि डोमेन %s नहीं पा सकता है" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "अतिथि डोमेन की स्थिति की जाँच हो रही है" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr " अतिथि डोमेन शुरू करने के लिए प्रतीक्षा की जा रही है " -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "अतिथि डोमेन सर्वर को शुरू करने के लिए प्रतीक्षा कर रहा है" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s के साथ libvirt से कनेक्ट करने में असमर्थ" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "कुछ नहीं" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "फाइल (_F)" @@ -585,30 +698,78 @@ msgid "Smartcard removal" msgstr "स्मार्टकार्ड हटाना" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "दृश्य (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "फुल स्क्रीन" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "ज़ूम (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "प्रदर्शित करे " -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "रिलीज कर्सर" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "कुंजी भेजें (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "सहायता (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/hr.po b/po/hr.po index 7930f61..6e7d195 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Croatian (http://www.transifex.com/projects/p/virt-viewer/language/hr/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Croatian\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/hr_HR.po b/po/hr_HR.po deleted file mode 100644 index 452a6fb..0000000 --- a/po/hr_HR.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/fedora/language/hr_HR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: hr_HR\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/hu.po b/po/hu.po index b107510..020c7cf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,26 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Nikolas Slivka , 2010 # Szabo Attila , 2013 # Zoltan Hoppár , 2012-2013 +# Porcsin László , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Hungarian (http://www.transifex.com/projects/p/virt-viewer/language/hu/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-02-22 10:54-0500\n" +"Last-Translator: Porcsin László \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/virt-viewer/" +"language/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Távoli megjelenítő" @@ -74,103 +77,142 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "alkalmazás verziója %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Verzió információk megjelenítése" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Ablak címének megadása" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Kapcsolat megnyitása a Spice vezérlő kommunikációjában" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Távoli megjelenítő kliens" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nFuttassa a '%s --help' parancsot a teljes elérhető parancssori opciókért\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Futtassa a '%s --help' parancsot a teljes elérhető parancssori opciókért\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Hiba: külön paraméterek kerültek megadásra a Spice vezérlő használatakor\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Hiba: külön paraméterek kerültek megadásra a Spice vezérlő használatakor\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Hiba: több URI nem kezelhető egyszerre\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Sikertelen kapcsolat indítás" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Kijelző kikapcsolva a vezérlő által" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Vezérlő kapcsolat sikertelen: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Kapcsolat részletei" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "_CD váltás" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Spice folyamat készítése nem lehetséges" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice folyamat beállítása..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Érvénytelen fájl %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Kapcsolattípus nem meghatározható az URI-ról " -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt kapcsolat megnyitása nem sikerült" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Folyamat nem indítható ehhez a típushoz: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Kapcsolat részletei" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "A Glade-ről" @@ -183,7 +225,9 @@ #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Távoli vezérlésű asztal kliens beépített GTK-VNC, SPICE-GTK és libvirt támogatással" +msgstr "" +"Távoli vezérlésű asztal kliens beépített GTK-VNC, SPICE-GTK és libvirt " +"támogatással" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -204,133 +248,164 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "A Fedora Fordítói csapata" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Biztos vagy abban hogy be akarod zárni ezt a kapcsolatot?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Ne kérdezze meg többet" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Várakozás a %d kijelzőre..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Ismeretlen grafikus mód típus %s vendégnél" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "SSH kapcsolat sikertelen." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Csatornára való csatlakozás meghiúsult, kizárólag SSH támogatott." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Kapcsolódás egy nem támogatott csatornához." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Csatlakozás egy grafikus kiszolgálóhoz" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Vendég tartomány leáll" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Csatlakozva a grafikus kiszolgálóhoz" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "%s grafikus kiszolgálóhoz a kapcsolódás nem lehetséges" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Bejelentkezés sikertelen a távoli kiszolgálónál itt: %s: %s\nMegpróbáljuk még egyszer?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Bejelentkezés sikertelen a távoli kiszolgálónál: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB átirányítási hiba: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d kijelző" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Ablak nagyítási fokozata, százalékban" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Gyorsbillentyűk testreszabása" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Részletes információk megjelenítése" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Hibakeresési információk megjelenítése" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Azonosítás szükséges" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "cimke" @@ -342,6 +417,14 @@ msgid "Username:" msgstr "Felhasználói név:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -374,204 +457,241 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Futtassa a '%s --help' parancsot a teljes elérhető parancssori opciókért" +msgstr "" +"Futtassa a '%s --help' parancsot a teljes elérhető parancssori opciókért" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nHasználata: %s [OPCIÓK] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Válasszon USB eszközöket az átirányításhoz" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Nem támogatott azonosítási mód: %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Képernyőkép" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Leválasztás" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB eszköz kiválasztás" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Billentyűkombináció küldése" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Teljes képernyő elhagyása" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Nyomjon %s billentyűt hogy kiszabadítsa a mutatót)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "Minimum %s verzió %s szükséges hogy beállítsd ezt a kapcsolatot" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Várakozás a vendégtartomány újraindulására" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "A vendég grafikus része nem meghatározható %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "A vendég grafikus címe nem meghatározható %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "A vendég részére kiszolgáló nem meghatározható %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Várakozás a libvirt elindulásáig" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Vendég tartomány keresése" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Várakozás a vendég tartomány elkészülésére" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Vendég tartomány nem található %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Vendég tartomány állapot ellenőrzése" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Várakozás a vendég tartomány indítására" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Várakozás a vendég tartományra hogy elindítsa a kiszolgálót" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "A %s címmel nem tudott csatlakozni a libvirthez" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[nincs]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Fájl" @@ -584,30 +704,78 @@ msgid "Smartcard removal" msgstr "Smartcard eltávolítása" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "Nézet" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Teljes képernyő" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "Nagyítás" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Kijelzők" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Kurzor eleresztése" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "Billentyű leütés" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "Súgó" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/hy.po b/po/hy.po deleted file mode 100644 index 30cbca1..0000000 --- a/po/hy.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Armenian (http://www.transifex.com/projects/p/virt-viewer/language/hy/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: hy\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/ia.po b/po/ia.po index d63a9a4..2c3078e 100644 --- a/po/ia.po +++ b/po/ia.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Interlingua (http://www.transifex.com/projects/p/virt-viewer/language/ia/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Interlingua\n" +"Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ia\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/id.po b/po/id.po index a768b20..b480dc2 100644 --- a/po/id.po +++ b/po/id.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/virt-viewer/language/id/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Indonesian\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ilo.po b/po/ilo.po index b4c06d1..db2e9e4 100644 --- a/po/ilo.po +++ b/po/ilo.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Iloko (http://www.transifex.com/projects/p/virt-viewer/language/ilo/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Iloko\n" +"Language: ilo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ilo\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/is.po b/po/is.po index 383c1e8..4bd36ca 100644 --- a/po/is.po +++ b/po/is.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Icelandic (http://www.transifex.com/projects/p/virt-viewer/language/is/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Icelandic\n" +"Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: is\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n%10!=1 || n%100==11)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/it.po b/po/it.po index 0d319aa..ed62c15 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Francesco D'Aluisio , 2013 # Francesco Tombolini , 2010 @@ -12,19 +12,21 @@ # Silvio Pierro , 2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/virt-viewer/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/virt-viewer/" +"language/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Visualizzatore remoto" @@ -78,103 +80,143 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "versione del visualizzatore-remoto %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Mostra informazioni sulla versione" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Imposta il titolo della finestra" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Apri collegamento usando una comunicazione SPICE" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nEseguire '%s --help' per avere un elenco completo di opzioni della linea di comando disponibili\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Eseguire '%s --help' per avere un elenco completo di opzioni della linea di " +"comando disponibili\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Errore: presenti troppi argomenti durante l'uso del controllore Spice\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Errore: presenti troppi argomenti durante l'uso del controllore Spice\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Errore: impossibile gestire URI multipli\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Inizializzazione connessione fallita" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Schermo disabilitato dal controller" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Connessione controller fallita: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Dettagli connessione" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Impossibile creare una sessione di Spice" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Impostazione sessione Spice in corso..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "File %s non valido" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Impossibile determinare il tipo di connessione dall'URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Impossibile aprire la sessione oVirt" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Impossibile creare una sessione per questo tipo: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Dettagli connessione" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Informazioni su Glade" @@ -208,133 +250,165 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Questo programma è un sofware libero, è possibile ridistribuirlo e/o modificarlo in conformità alle disposizioni della GNU General Public License come viene pubblicata dalla Free Software Foundation; versione 2 della licenza o (a scelta) tutte le versioni successive.\n\nQuesto programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, e senza garanzia implicita di COMMERCIALIZZAZIONE o di ADATTAMENTO AD UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la GNU General Public License.\n\nInsieme a questo programma deve essere fornita una copia della GNU General Public License; in caso contrario scrivere alla Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"Questo programma è un sofware libero, è possibile ridistribuirlo e/o " +"modificarlo in conformità alle disposizioni della GNU General Public License " +"come viene pubblicata dalla Free Software Foundation; versione 2 della " +"licenza o (a scelta) tutte le versioni successive.\n" +"\n" +"Questo programma è distribuito nella speranza che possa essere utile, ma " +"SENZA ALCUNA GARANZIA, e senza garanzia implicita di COMMERCIALIZZAZIONE o " +"di ADATTAMENTO AD UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la " +"GNU General Public License.\n" +"\n" +"Insieme a questo programma deve essere fornita una copia della GNU General " +"Public License; in caso contrario scrivere alla Free Software Foundation, " +"Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Il Fedora Translation Team" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Desideri terminare la sessione?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Non chiedermelo più" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "In attesa del display %d..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Impossibile determinare il tipo grafico per il guest %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Connessione a ssh fallita." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Impossibile connettersi al canale, è supportato solo SSH." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Connessione al canale non supportata." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Connessione al server grafico in corso" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Il dominio del guest si è arrestato" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Connesso al server grafico" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Impossibile connettersi al server grafico %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Impossibile eseguire l'autenticazione con il server desktop remoto su %s: %s\nRiprovare il collegamento?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" -msgstr "Impossibile eseguire l'autenticazione con il server desktop remoto su: %s" - -#: ../src/virt-viewer-app.c:1404 +msgstr "" +"Impossibile eseguire l'autenticazione con il server desktop remoto su: %s" + +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Errore di reindirizzamento USB: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Livello di Zoom deve essere tra %d-%d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Visualizza %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Argomento kiosk-quit invalido: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Livello di zoom della finestra, in percentuale" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Personalizza i tasti di scelta rapida" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Abilita modalità Kiosk" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Esci dalla modalità kiosk in una data condizione" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Mostra informazioni dettagliate" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Mostra le informazioni di debug" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Autenticazione necessaria" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "etichetta" @@ -346,6 +420,14 @@ msgid "Username:" msgstr "Nome utente:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -378,204 +460,242 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Eseguire '%s --help' per avere un elenco completo di opzioni della linea di comando disponibili" +msgstr "" +"Eseguire '%s --help' per avere un elenco completo di opzioni della linea di " +"comando disponibili" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nUtilizzo: %s [OPZIONI] NOME-DOMINIO|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "password non valida" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Seleziona i dispositivi USB per il reindirizzamento" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Tipo di autenticazione %d non supportata" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Schermata" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Scollega" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Selezione dispositivo USB" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Invia combinazione di tasti" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Lascia a schermo intero" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Premere %s per rilasciare il puntatore)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "%s versione %s è requisito minimo per configurare questa connessione" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "In attesa del riavvio del dominio guest" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Impossibile determinare il tipo grafico per il guest %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Impossibile determinare l'indirizzo grafico per il guest %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Impossibile determinare l'host per il guest %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "In attesa dell'avvio di libvirt" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Ricerca dominio guest in corso" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "In attesa di creazione del dominio guest" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Impossibile trovare il dominio guest %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Controllo stato del dominio guest in corso" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "In attesa dell'avvio del dominio guest" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "In attesa che il dominio guest avvii il server" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Impossibile connettersi a libvirt con la URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[nessuno]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_File" @@ -588,30 +708,78 @@ msgid "Smartcard removal" msgstr "Rimozione Smartcard" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Visualizza" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Schermo intero" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Zoom" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Display" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Rilascia il cursore" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Invia combinazione tasti" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Aiuto" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po deleted file mode 100644 index 3658155..0000000 --- a/po/it_IT.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/fedora/language/it_IT/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: it_IT\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/ja.po b/po/ja.po index 2eb1470..502cc4d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,26 +1,30 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Hajime Taira , 2012-2014 # Kiyoto Hashida , 2010 +# noriko , 2014 # Tomoyuki KATO , 2012-2013 +# Hajime Taira , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/virt-viewer/language/ja/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-12-08 10:06-0500\n" +"Last-Translator: Hajime Taira \n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/virt-viewer/" +"language/ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "リモートビューアー" @@ -74,103 +78,143 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer バージョン %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "remote-viewer バージョン %s" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "バージョン情報を表示します" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "ウィンドウタイトルの設定" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Spice コントローラー通信を使用して接続を開く" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "リモートビューアークライアント" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\n利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実行してください\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実" +"行してください\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "エラー: Spice コントローラーを使用しているときに余計な引数が指定されました\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"エラー: Spice コントローラーを使用しているときに余計な引数が指定されました\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Error: 複数の URI を処理できません\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "接続の初期化に失敗しました" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "ディスプレイがコントローラーにより無効化されました" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "コントローラーの接続に失敗しました: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "接続の詳細" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "CDの変更(_C)" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "oVirt URI の構文解析に失敗しました" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "認証が取り消されました" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "oVirt上の仮想マシン %s は稼働していません" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "oVirt上の仮想マシン %s にはディスプレイがありません" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "oVirt 上の仮想マシン %s はホストの情報がありません" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Spice セッションを作成できませんでした" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "oVirt上の仮想マシン %s は不明なディスプレイタイプ: %d を搭載しています" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice セッションのセットアップ中..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "無効なファイル %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "接続が選択されていません" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "無効なファイル %s:" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI から接続の種類を決定できません" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt セッションを開けませんでした" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "この種類のセッションを作成できませんでした: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "oVirt セッションを開けません:" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "接続の詳細" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "接続アドレス" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "例: spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "最近の接続" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "取り消し" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "接続" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade について" @@ -180,10 +224,14 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "GTK-VNC, SPICE-GTK および libvirt でビルドされたリモートデスクトップクライアント" +msgstr "" +"GTK-VNC, SPICE-GTK および libvirt でビルドされたリモートデスクトップクライア" +"ント" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -204,133 +252,170 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "The Fedora Translation Team" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "セッションを閉じますか?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "二度と確認しない" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "ディスプレイ %d を待機中..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "仮想マシン %s のグラフィックの種類が未知の種類です" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "サポートされないグラフィックス形式 '%s' です" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "SSH への接続に失敗しました。" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "チャンネルに接続できません、SSH のみがサポートされます。" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "サポートされないチャネルに接続します。" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "ディスプレイは libvirt にて --attach を指定する場合にのみ付与できます" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "グラフィックサーバーに接続中" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "仮想マシンがシャットダウンしました" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "グラフィックサーバーに接続" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "グラフィックサーバー %s に接続できません" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s のリモートデスクトップサーバーの認証で失敗しました: %s\n再び接続を試行しますか？" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "%s 上のリモートデスクトップサーバーの認証で失敗しました: %s\n" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "リモートデスクトップサーバーの認証で失敗しました: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB リダイレクトエラー: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "ズームレベルは %d-%d の範囲内でなければいけません\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "ディスプレイ %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "無効な kiosk-quit の引数: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "ウィンドウのズームレベル（パーセント単位）" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "フルスクリーンモードで開きます (クライアントに適するよう、仮想マシンを自動調整します)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"フルスクリーンモードで開きます (クライアントに適するよう、仮想マシンを自動調" +"整します)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "ホットキーのカスタマイズ" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Kiosk モードを有効化" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Kiosk モードを与えられた条件で終了します" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "詳細情報を表示します" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "デバッグ情報を表示します" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" +"%s 接続のために認証が必要です:\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "%s 接続のために認証が必要です:\n" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "認証が必要です" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "ラベル" @@ -342,6 +427,14 @@ msgid "Username:" msgstr "ユーザー名:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "パスワードの表示" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "VNC が GUID を提供していません" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -374,204 +467,252 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実行してください" +msgstr "" +"利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実" +"行してください" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "仮想マシングラフィカルコンソール" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\n使用法: %s [オプション] ドメイン名|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" +"\n" +"使用法: %s [オプション] [ドメイン名|ID|UUID]\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" +"\n" +"'--wait' に対して ドメイン名|ID|UUID が指定されていません\n" +"\n" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "無効なパスワード" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "リダイレクトする USB デバイスを選択" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "サポートしていない認証の種類 %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "仮想マシンが見つかりません" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "仮想マシンが何も選択されていません" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+Del(_D)" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+Backspace(_B)" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F1(_1)" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F2(_2)" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F3(_3)" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F4(_4)" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F5(_5)" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F6(_6)" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F7(_7)" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F8(_8)" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F9(_9)" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F10(_0)" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "スクリーンショット" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "不明" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "切断" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB デバイスの選択" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "組み合わせキーの送信" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "フルスクリーンの解除" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(ポインターを開放するには %s を押します)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" +"この接続を確立するために少なくとも %s バージョン %s が必要です。詳しくは %s " +"をご確認下さい。" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" -msgstr "少なくとも %s バージョン %s がこのセッションをセットアップするために必要です" - -#: ../src/virt-viewer.c:133 +msgstr "この接続を確立するために少なくとも %s バージョン %s が必要です。" + +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "仮想マシンが再起動するのを待機中" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "仮想マシン %s のグラフィックの種類を決定できません" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "仮想マシン %s のグラフィックのアドレスを決定できません" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "仮想マシン %s のホストを決定できません" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "ゲスト '%s' が応答しません" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "仮想マシン %s は稼働していません" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt の起動を待つ" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "仮想マシンを検索中" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "仮想マシンが作成されるのを待機中" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "仮想マシン %s が見つかりません" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "仮想マシンの状態を確認中" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "ゲストの状態を取得できませんでした" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "仮想マシンが開始するのを待機中" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "仮想マシンがサーバーを開始するのを待機中" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s で libvirt に接続できません" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "libvirt URI に接続できません: %s" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[なし]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "認証に失敗しました。" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "接続に失敗しました:" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ファイル(_F)" @@ -584,30 +725,78 @@ msgid "Smartcard removal" msgstr "スマートカードの抜き取り" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "個人設定" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "表示(_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "フルスクリーン" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "ズーム(_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "ディスプレイ" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "カーソルの開放" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "キーを送信(_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "ヘルプ(_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "仮想マシンの詳細(_G)" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "仮想マシンの詳細" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "名前:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "仮想マシンの選択" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "名前" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "利用可能な仮想マシン" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "フォルダー共有" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "共有フォルダー" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "読み込み専用" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "Spice" diff --git a/po/ja_JP.po b/po/ja_JP.po deleted file mode 100644 index b2d46bf..0000000 --- a/po/ja_JP.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/fedora/language/ja_JP/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ja_JP\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/ka.po b/po/ka.po index a43f026..b56505c 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Georgian (http://www.transifex.com/projects/p/virt-viewer/language/ka/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Georgian\n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ka\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/kk.po b/po/kk.po index cac95ad..c96e809 100644 --- a/po/kk.po +++ b/po/kk.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Kazakh (http://www.transifex.com/projects/p/virt-viewer/language/kk/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Kazakh\n" +"Language: kk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: kk\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/km.po b/po/km.po index 95b37f7..56dbfdd 100644 --- a/po/km.po +++ b/po/km.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Khmer (http://www.transifex.com/projects/p/virt-viewer/language/km/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Khmer\n" +"Language: km\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: km\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/kn.po b/po/kn.po index ea99a74..1e60531 100644 --- a/po/kn.po +++ b/po/kn.po @@ -1,28 +1,30 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# shanky , 2013 +# shanky , 2013-2014 # shanky , 2012 # shankar , 2010, 2012 # shankar , 2010,2012 # shanky , 2012-2013 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Kannada (http://www.transifex.com/projects/p/virt-viewer/language/kn/)\n" +"Language-Team: Kannada (http://www.transifex.com/projects/p/virt-viewer/" +"language/kn/)\n" +"Language: kn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: kn\n" "Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "ದೂರಸ್ಥ ವೀಕ್ಷಕ" @@ -76,103 +78,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "ದೂರದ-ವೀಕ್ಷಕದ ಆವೃತ್ತಿ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "ಪ್ರದರ್ಶನ ಆವೃತ್ತಿ ಮಾಹಿತಿ" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "ಕಿಟಕಿಯ ಶೀರ್ಷಿಕೆಯನ್ನು ಹೊಂದಿಸು" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "ಸ್ಪೈಸ್ ನಿಯಂತ್ರಣ ವ್ಯವಹಾರವನ್ನು ಬಳಸಿಕೊಂಡು ಸಂಪರ್ಕವನ್ನು ತೆರೆ" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "- ದೂರದ ವೀಕ್ಷಕದ ಕ್ಲೈಂಟ್" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nಲಭ್ಯವಿರುವ ಆಜ್ಞಾಸಾಲಿನ ಆಯ್ಕೆಗಳ ಸಂಪೂರ್ಣ ಪಟ್ಟಿಗಾಗಿ '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"ಲಭ್ಯವಿರುವ ಆಜ್ಞಾಸಾಲಿನ ಆಯ್ಕೆಗಳ ಸಂಪೂರ್ಣ ಪಟ್ಟಿಗಾಗಿ '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "ದೋಷ: ಸ್ಪೈಸ್‌ ನಿಯಂತ್ರಕವನ್ನು ಬಳಸುವಾಗ ಹೆಚ್ಚುವರಿ ಆರ್ಗ್ಯುಮೆಂಟ್‌ಗಳು\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "ದೋಷ: ಅನೇಕ URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "ಸಂಪರ್ಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "ನಿಯಂತ್ರಕದಿಂದ ಪ್ರದರ್ಶಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "ನಿಯಂತ್ರಕದ ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "ಸಂಪರ್ಕ ವಿವರಗಳು" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "ಸ್ಪೈಸ್ ಅಧಿವೇಶನವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "ಸ್ಪೈಸ್ ಅಧಿವೇಶನವನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "ಅಮಾನ್ಯವಾದ ಕಡತ %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI ಇಂದ ಸಂಪರ್ಕದ ಬಗೆಯನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt ಅಧಿವೇಶನವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "ಈ ಬಗೆಗಾಗಿ ಒಂದು ಅಧಿವೇಶನವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:%s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "ಸಂಪರ್ಕ ವಿವರಗಳು" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "ಉದಾಹರಣೆಗೆ, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "ಗ್ಲೇಡ್ ಕುರಿತು" @@ -182,6 +222,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"ಹಕ್ಕು (C) 2007-2012 Daniel P. Berrange\n" +"ಹಕ್ಕು (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -206,133 +248,166 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "ಫೆಡೋರ ಟ್ರಾನ್ಸಲೇಶನ್ ಟೀಮ್" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "ನೀವು ಈ ಅಧಿವೇಶನವನ್ನು ಮುಚ್ಚಲು ಬಯಸುವಿರಾ?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "ಪುನಃ ನನ್ನನ್ನು ಕೇಳಬೇಡ" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "%d ಪ್ರದರ್ಶಕಕ್ಕಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "%s ಅತಿಥಿಗಾಗಿ ಗೊತ್ತಿರದ ಗ್ರಾಫಿಕ್ ಬಗೆ" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh ಗೆ ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "ಚಾನಲ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ, SSH ಅನ್ನು ಮಾತ್ರ ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "ಚಾನಲ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸುವುದನ್ನು ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "ಗ್ರಾಫಿಕ್ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲಾಗುತ್ತಿದೆ" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಅನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಲಾಗಿದೆ" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "ಗ್ರಾಫಿಕ್ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "%s ಎಂಬ ಗ್ರಾಫಿಕ್ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s ನಲ್ಲಿನ ದೂರದ ಗಣಕತೆರೆ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\nಸಂಪರ್ಕಕ್ಕಾಗಿ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಬೇಕೆ?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "ದೂರದ ಗಣಕತೆರೆ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB ಮರುನಿರ್ದೇಶನ ದೋಷ: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "ಗಾತ್ರ ಬದಲಾವಣೆ ಮಟ್ಟವು %d-%d ರ ನಡುವೆ ಇರಬೇಕು\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d ಅನ್ನು ತೋರಿಸು" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "ಅಮಾನ್ಯವಾದ ಕಿಯೋಸ್ಕ್-ನಿರ್ಗಮನದ ಆರ್ಗ್ಯುಮೆಂಟ್: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "ಕಿಟಕಿಯ ಗಾತ್ರ ಬದಲಾವಣೆ, ಪ್ರತಿಶತದಲ್ಲಿ" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" - -#: ../src/virt-viewer-app.c:2314 +"ಪೂರ್ಣತೆರೆ ಕ್ರಮದಲ್ಲಿ ತೆರೆ (ಕ್ಲೈಂಟ್‌ನ ರೆಸಲ್ಯೂಶನ್‌ಗೆ ಹೊಂದಿಕೆಯಾಗುವಂತೆ ಅತಿಥಿಯನ್ನು " +"ಸರಿಹೊಂದಿಸುತ್ತದೆ)." + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "ಹಾಟ್‌ಕೀಲಿಗಳನ್ನು ಅಗತ್ಯಾನುಗುಣಗೊಳಿಸು" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "ಕಿಯೋಸ್ಕ್ ಕ್ರಮವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "ಕಿಯೋಸ್ಕ್ ಕ್ರಮದಲ್ಲಿ ಒದಗಿಸಲಾದ ಸ್ಥಿತಿಯಲ್ಲಿ ನಿರ್ಗಮಿಸು" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "ವರ್ಬೋಸ್ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ದೋಷನಿದಾನ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "ಲೇಬಲ್" @@ -344,6 +419,14 @@ msgid "Username:" msgstr "ಬಳಕೆದಾರ ಹೆಸರು:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -380,200 +463,236 @@ #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "- ವರ್ಚುವಲ್ ಗಣಕದ ಗ್ರಾಫಿಕಲ್‌ ಕನ್ಸೋಲ್" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nಬಳಕೆ: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "ಅಮಾನ್ಯವಾದ ಗುಪ್ತಪದ" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "ಮರುನಿರ್ದೇಶನಕ್ಕಾಗಿ USB ಸಾಧನಗಳನ್ನು ಆರಿಸಿ" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "ಬೆಂಬಲವಿರದ ದೃಢೀಕರಣದ ಬಗೆ %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "ತೆರೆಚಿತ್ರ" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "ಸಂಪರ್ಕ ಕಡಿದುಹಾಕು" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB ಸಾಧನವನ್ನು ಆರಿಸುವಿಕೆ" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "ಕೀಲಿಯ ಸಂಯೋಜನೆಯನ್ನು ಕಳುಹಿಸು" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "ಪೂರ್ಣತೆರೆಯಿಂದ ನಿರ್ಗಮಿಸು" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(ಸೂಚಕವನ್ನು ಮುಕ್ತಗೊಳಿಸಲು %s ಅನ್ನು ಒತ್ತಿ)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "ಈ ಸಂಪರ್ಕವನ್ನು ಸಿದ್ಧಗೊಳಿಸಲು ಕನಿಷ್ಟ %s ಆವೃತ್ತಿ %s ಅಗತ್ಯವಿದೆ" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಮರಳಿ-ಆರಂಭಗೊಳ್ಳಲು ಕಾಯಲಾಗುತ್ತಿದೆ" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "%s ಎಂಬ ಅತಿಥಿಗಾಗಿ ಗ್ರಾಫಿಕ್‌ನ ಬಗೆಯನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "%s ಎಂಬ ಅತಿಥಿಗಾಗಿ ಗ್ರಾಫಿಕ್‌ನ ವಿಳಾಸವನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "%s ಎಂಬ ಅತಿಥಿಗಾಗಿ ಆತಿಥೇಯವನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt ಆರಂಭಗೊಳ್ಳುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಅನ್ನು ಪತ್ತೆ ಮಾಡಲಾಗುತ್ತಿದೆ" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ನಿರ್ಮಾಣಗೊಳ್ಳಲು ಕಾಯಲಾಗುತ್ತಿದೆ" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "ಅತಿಥಿ ಡೊಮೈನ್ %s ಕಂಡುಬಂದಿಲ್ಲ" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಸ್ಥಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಮರಳಿ-ಆರಂಭಗೊಳ್ಳಲು ಕಾಯಲಾಗುತ್ತಿದೆ" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಪೂರೈಕೆಗಣಕವನ್ನು ಆರಂಭಿಸುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s ಯೊಂದಿಗೆ libvirt ಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[ಯಾವುದೂ ಇಲ್ಲ]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ಕಡತ (_F)" @@ -586,30 +705,78 @@ msgid "Smartcard removal" msgstr "ಸ್ಮಾರ್ಟ್ ಕಾರ್ಡ್ ತೆಗೆದುಹಾಕುವಿಕೆ" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "ನೋಟ (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "ಪೂರ್ಣ ತೆರೆ" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "ಹಿಗ್ಗಿಸು/ಕುಗ್ಗಿಸು (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "ಪ್ರದರ್ಶಕಗಳು" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "ತೆರೆಸೂಚಕವನ್ನು ಮುಕ್ತಗೊಳಿಸು" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "ಕಳುಹಿಸುವ ಕೀಲಿ (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "ನೆರವು (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ko.po b/po/ko.po index 8c5c75b..58980d5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Automatically generated, 2010 # eukim , 2013 @@ -10,19 +10,21 @@ # Hyunsok Oh , 2010 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Korean (http://www.transifex.com/projects/p/virt-viewer/language/ko/)\n" +"Language-Team: Korean (http://www.transifex.com/projects/p/virt-viewer/" +"language/ko/)\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "원격 뷰어" @@ -76,103 +78,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer 버전 %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "버전 정보 보기 " -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "창 제목 설정 " -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Spice 컨트롤러 통신을 사용하여 연결을 오픈합니다 " -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\n사용 가능한 명령행 옵션의 전체 목록을 보려면 '%s --help'를 실행하십시오\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"사용 가능한 명령행 옵션의 전체 목록을 보려면 '%s --help'를 실행하십시오\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "오류: Spice 컨트롤러를 사용하는 도중 불필요한 인수가 지정되었습니다\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "오류: 여러 URI를 처리할 수 없습니다\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "연결 초기화 실패 " -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "컨트롤러에 의해 디스플레이가 비활성화됨 " -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "컨트롤러 연결에 실패함: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "상세 연결 정보" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Spice 세션을 생성할 수 없음 " - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice 세션 설정 중..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "잘못된 파일 %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI에서 연결 유형을 지정할 수 없음 " -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "이러한 유형의 세션을 생성할 수 없음: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "상세 연결 정보" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade에 관하여 " @@ -206,133 +246,164 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora 번역팀 " -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "세션을 종료하시겠습니까?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "다시 묻지 않습니다 " -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "디스플레이 %d를 기다리는 중..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "게스트 %s의 그래픽 유형을 알 수 없습니다 " - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh 연결을 실패했습니다. " -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "채널에 연결할 수 없습니다, SSH만 지원됩니다. " -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "지원되지 않는 채널에 연결합니다. " -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "그래픽 서버에 연결 중 " -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "게스트 도메인이 종료되었습니다 " -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "그래픽 서버에 연결 " -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "그래픽 서버 %s에 연결할 수 없음 " -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s의 원격 데스크톱 서버에 인증할 수 없습니다: %s\n연결을 다시 시도 하시겠습니까? " - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "원격 데스크탑 서버로 인증할 수 없음: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB 리디렉션 오류: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "디스플레이 %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "윈도우의 줌 레벨 (백분율) " -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "핫키 사용자 정의 " -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "상세 정보 보기 " -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "디버그 정보 보기 " +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "인증이 필요함 " -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "레이블 " @@ -344,6 +415,14 @@ msgid "Username:" msgstr "사용자 이름 " +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -376,204 +455,241 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "사용 가능한 명령행 옵션의 전체 목록을 보려면 '%s --help'를 실행하십시오 " +msgstr "" +"사용 가능한 명령행 옵션의 전체 목록을 보려면 '%s --help'를 실행하십시오 " #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\n사용법: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "리디렉션을 위한 USB 장치 선택 " -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "지원되지 않는 인증 유형 %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+Del(_D) " -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+Backspace(_B)" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "스크린샷 " -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "연결 해제 " -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB 장치 선택 " -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "조합 키 전송" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "전체 화면 해제 " -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(포인터를 개방하려면 %s를 누르십시오)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "다시 시작할 게스트 도메인을 기다리는 중 " -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "게스트 %s의 그래픽 유형을 지정할 수 없음 " -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "게스트 %s의 그래픽 주소를 지정할 수 없음 " - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "게스트 %s의 호스트를 지정할 수 없음 " -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt 시작을 기다리는 중 " -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "게스트 도메인 검색 중 " -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "게스트 도메인이 생성되기를 기다리는 중 " -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "게스트 도메인 %s를 찾을 수 없음 " - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "게스트 도메인 상태 확인 중 " -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "시작할 게스트 도메인을 기다리는 중 " -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "서버를 시작할 게스트 도메인을 기다리는 중 " - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s로 libvirt에 연결할 수 없음 " - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[없음]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "파일(_F)" @@ -586,30 +702,78 @@ msgid "Smartcard removal" msgstr "스마트카드 제거 " -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "보기(_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "전체 화면 " -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "줌(_Z) " -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "디스플레이 " -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "커서 개방 " -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "키 전송(_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "도움말(_H) " + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ks.po b/po/ks.po deleted file mode 100644 index 0f89374..0000000 --- a/po/ks.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Kashmiri (http://www.transifex.com/projects/p/virt-viewer/language/ks/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ks\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/ku.po b/po/ku.po deleted file mode 100644 index a75e17a..0000000 --- a/po/ku.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Kurdish (http://www.transifex.com/projects/p/virt-viewer/language/ku/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ku\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/kw.po b/po/kw.po new file mode 100644 index 0000000..80173d9 --- /dev/null +++ b/po/kw.po @@ -0,0 +1,758 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Cornish\n" +"Language: kw\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : " +"3\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/kw@kkcor.po b/po/kw@kkcor.po new file mode 100644 index 0000000..827103c --- /dev/null +++ b/po/kw@kkcor.po @@ -0,0 +1,758 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Cornish (Common Orthography)\n" +"Language: kw@kkcor\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : " +"3\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/kw@uccor.po b/po/kw@uccor.po new file mode 100644 index 0000000..7917662 --- /dev/null +++ b/po/kw@uccor.po @@ -0,0 +1,758 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Cornish (Unified Orthography)\n" +"Language: kw@uccor\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : " +"3\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/kw_GB.po b/po/kw_GB.po new file mode 100644 index 0000000..96d020b --- /dev/null +++ b/po/kw_GB.po @@ -0,0 +1,758 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Cornish (United Kingdom)\n" +"Language: kw-GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : " +"3\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ky.po b/po/ky.po index 3caa1a4..4ba26ba 100644 --- a/po/ky.po +++ b/po/ky.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Kirgyz (http://www.transifex.com/projects/p/virt-viewer/language/ky/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Kirghiz\n" +"Language: ky\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ky\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/la.po b/po/la.po deleted file mode 100644 index 7636cc8..0000000 --- a/po/la.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Latin (http://www.transifex.com/projects/p/virt-viewer/language/la/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: la\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/lo.po b/po/lo.po deleted file mode 100644 index 5c91f17..0000000 --- a/po/lo.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Lao (http://www.transifex.com/projects/p/virt-viewer/language/lo/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: lo\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/lt.po b/po/lt.po index 7e0d72d..e10381c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Lithuanian (http://www.transifex.com/projects/p/virt-viewer/language/lt/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Lithuanian\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 or n%100>=20) ? 1 : 2)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/lv.po b/po/lv.po index 675f127..f96e476 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Latvian (http://www.transifex.com/projects/p/virt-viewer/language/lv/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Latvian\n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lv\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/mai.po b/po/mai.po index c0b9fb2..a6080e3 100644 --- a/po/mai.po +++ b/po/mai.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Maithili (http://www.transifex.com/projects/p/virt-viewer/language/mai/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Maithili\n" +"Language: mai\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mai\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/mg.po b/po/mg.po deleted file mode 100644 index 24a5124..0000000 --- a/po/mg.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Malagasy (http://www.transifex.com/projects/p/virt-viewer/language/mg/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: mg\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/mk.po b/po/mk.po index 8c76382..0434277 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Macedonian (http://www.transifex.com/projects/p/virt-viewer/language/mk/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Macedonian\n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mk\n" -"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ml.po b/po/ml.po index 1630693..078c974 100644 --- a/po/ml.po +++ b/po/ml.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# Ani Peter , 2010,2012-2013 +# Ani Peter , 2010,2012-2014 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Malayalam (http://www.transifex.com/projects/p/virt-viewer/language/ml/)\n" +"Language-Team: Malayalam (http://www.transifex.com/projects/p/virt-viewer/" +"language/ml/)\n" +"Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "റിമോട്ട് വ്യൂവര്‍" @@ -72,103 +74,142 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer പതിപ്പു് %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "പതിപ്പിനെപ്പറ്റിയുള്ള വിവരം കാണിയ്ക്കുക" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "ജാലകത്തിന്റെ തലക്കെട്ട് സജ്ജമാക്കുക" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "സ്പയിസ് കണ്ട്രോളര്‍ ആശയവിനിമയം ഉപയോഗിച്ചു് കണക്ഷന്‍ തുറക്കുക" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "റിമോട്ട് വ്യൂവര്‍ ക്ലയന്റ്" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s --help' പ്രവര്‍ത്തിപ്പിയ്ക്കുക\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s --help' " +"പ്രവര്‍ത്തിപ്പിയ്ക്കുക\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "പിശക്: സ്പയിസ് കണ്ട്രോളര്‍ ഉപയോഗിയ്ക്കുമ്പോള്‍ നല്‍കുന്ന അധികമായ ആര്‍ഗ്യുമെന്റുകള്‍\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "പിശക്: അനവധി യുആര്‍ഐ കൈകാര്യം ചെയ്യുവാന്‍ സാധ്യമല്ല\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "കണക്ഷന്‍ ആരംഭിയ്ക്കുന്നതില്‍ പരാജയം" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "കണ്ട്രോളര്‍ പ്രദര്‍ശനം പ്രവര്‍ത്തന രഹിതമാക്കിയിരിയ്ക്കുന്നു" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "കണ്ട്രോളറിനുള്ള കണക്ഷന്‍ പരാജയപ്പെട്ടു: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "കണക്ഷന്‍ വിശദാംശങ്ങള്‍" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "ഒരു സ്പയിസ് സെഷന്‍ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "സ്പയിസ് സെഷന്‍ സജ്ജമാക്കുന്നു..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "തെറ്റായ ഫയല്‍ %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "യുആര്‍ഐയില്‍ നിന്നും കണക്ഷന്‍ രീതി കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt സെഷന്‍ തുറക്കുവാന്‍ സാധ്യമായില്ല" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "ഈ തരത്തിനുള്ളൊരു സെഷന്‍ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "കണക്ഷന്‍ വിശദാംശങ്ങള്‍" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "ഉദാഹരണത്തിനു്, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "ഗ്ലേഡിനെപ്പറ്റി" @@ -178,6 +219,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"പകര്‍പ്പവകാശം (C) 2007-2012 ഡാനിയല്‍ പി. ബറെയിഞ്ച്\n" +"പകര്‍പ്പവകാശം (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -202,133 +245,162 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "ഈ പ്രോഗ്രാം സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ആകുന്നു; നിങ്ങള്‍ക്കിത് ഗ്നു ജനറല്‍ പബ്ലിക്ലൈസന്‍സിന്റെ നിബന്ധനകള്‍ പ്രകാരം (രണ്ടാം ലക്കം അല്ലെങ്കില്‍ നിങ്ങളുടെ താല്‍പര്യമനുസരിച്ച് അതിലും പുതിയ ലക്കം) വീണ്ടും വിതരണം ചെയ്യുകയോ മാറ്റം വരുത്തുകയോ ചെയ്യാം. ഫ്രീ സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ ആണ് ഈ ലൈസന്‍സ് പ്രസിദ്ധീകരിച്ചിട്ടുള്ളത്.\n\nവളരെ ഫലപ്രദമായ പ്രോഗ്രാം എന്ന പ്രതീക്ഷയിലാകുന്നു ഈ പ്രോഗ്രാം വിതരണം ചെയ്തത്.ഇതിന് വാറന്റി ലഭ്യമല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി ഗ്നു ജനറല്‍ പബ്ളിക് ലൈസന്‍സ് കാണുക.\n\nഈ പ്രോഗ്രാമിനൊപ്പം നിങ്ങള്‍ക്ക് ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പും ലഭിച്ചിരിക്കണം, ഇല്ലായെങ്കില്‍, ‌താഴെ പറയുന്ന മേല്‍വിലാസത്തിലേക്ക് എഴുതുക: Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"ഈ പ്രോഗ്രാം സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ആകുന്നു; നിങ്ങള്‍ക്കിത് ഗ്നു ജനറല്‍ പബ്ലിക്ലൈസന്‍സിന്റെ നിബന്ധനകള്‍ " +"പ്രകാരം (രണ്ടാം ലക്കം അല്ലെങ്കില്‍ നിങ്ങളുടെ താല്‍പര്യമനുസരിച്ച് അതിലും പുതിയ ലക്കം) വീണ്ടും " +"വിതരണം ചെയ്യുകയോ മാറ്റം വരുത്തുകയോ ചെയ്യാം. ഫ്രീ സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ ആണ് ഈ ലൈസന്‍സ് " +"പ്രസിദ്ധീകരിച്ചിട്ടുള്ളത്.\n" +"\n" +"വളരെ ഫലപ്രദമായ പ്രോഗ്രാം എന്ന പ്രതീക്ഷയിലാകുന്നു ഈ പ്രോഗ്രാം വിതരണം ചെയ്തത്.ഇതിന് വാറന്റി " +"ലഭ്യമല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി ഗ്നു ജനറല്‍ പബ്ളിക് ലൈസന്‍സ് കാണുക.\n" +"\n" +"ഈ പ്രോഗ്രാമിനൊപ്പം നിങ്ങള്‍ക്ക് ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പും ലഭിച്ചിരിക്കണം, " +"ഇല്ലായെങ്കില്‍, ‌താഴെ പറയുന്ന മേല്‍വിലാസത്തിലേക്ക് എഴുതുക: Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "ഫെഡോറാ പ്രാദേശികവത്കരണ സംഘം" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "ഈ സെഷന്‍ അടയ്ക്കണമോ?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "ഇനി ചോദിയ്ക്കരുതു്" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "%d പ്രദര്‍ശനത്തിനായി കാത്തിരിയ്ക്കുന്നു..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "ഗസ്റ്റ് %s-നുള്ള അപരിചിതമായ ഗ്രാഫിക് രീതി" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh-ലേക്കുള്ള കണക്ഷന്‍ പരാജയപ്പെട്ടു." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "ചാനലിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല, എസ്എസ്എചിനു് മാത്രം പിന്തുണ ലഭ്യമുള്ളൂ." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "ചാനലിലേക്കുള്ള കണക്ഷനു് പിന്തുണയില്ല." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "ഗ്രാഫിക് സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുന്നു" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ അടച്ചുപൂട്ടിയിരിയ്ക്കുന്നു" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "ഗ്രാഫിക് സര്‍വറിലേക്കു് കണക്ട് ചെയ്തിരിയ്ക്കുന്നു" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "ഗ്രാഫിക് സര്‍വര്‍ %s-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s-ല്‍ റിമോട്ട് ഡസ്ക്ടോപ്പ് സര്‍വറിലേക്കു് ആധികാരികത ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല: %s\nവീണ്ടും ശ്രമിയ്ക്കണമോ?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "റിമോട്ട് ഡസ്ക്ടോപ്പ് സര്‍വറിനൊപ്പം ആധികാരികത ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "യുഎസ്ബി റീഡയറക്ഷന്‍ പിശക്: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "സൂം ലവല്‍ %d-%d ആയിരിയ്ക്കണം\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d പ്രദര്‍ശിപ്പിയ്ക്കുക" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "തെറ്റായ kiosk-quit ആര്‍ഗ്യുമെന്റ്: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "ജാലകത്തിന്റെ സൂം ലവല്‍, ശതമാനത്തില്‍" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 +msgstr "സ്ക്രീന്‍ പൂര്‍ണ്ണവലിപ്പത്തില്‍ തുറക്കുക (ക്ലയന്റിനു് പാകത്തിനു് ഗസ്റ്റ് റിസല്യൂഷന്‍ സജ്ജമാക്കുന്നു)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "എഴുപ്പവഴികള്‍ യഥേഷ്ടമാക്കുക" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "കിയോസ്ക് മോഡ് പ്രവര്‍ത്തന സജ്ജമാക്കുക" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "കിയോസ്ക് മോഡിലുള്ള നല്‍കിയിരിയ്ക്കുന്ന അവസ്ഥയില്‍ പുറത്തു് കടക്കുക" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "വെര്‍ബോസ് വിവരം കാണിയ്ക്കുക" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ഡീബഗ്ഗിങ് വിവരം കാണിയ്ക്കുക" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "ആധികാരികത ഉറപ്പാക്കല്‍ ആവശ്യമുണ്ടു്" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "ലേബല്‍" @@ -340,6 +412,14 @@ msgid "Username:" msgstr "ഉപയോക്തൃനാമം:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -372,204 +452,241 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s --help' പ്രവര്‍ത്തിപ്പിയ്ക്കുക" +msgstr "" +"ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s --help' പ്രവര്‍ത്തിപ്പിയ്ക്കുക" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "വിര്‍ച്ച്വല്‍ മഷീന്‍ ഗ്രാഫിക്കല്‍ കണ്‍സോള്‍" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nUsage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "തെറ്റായ രഹസ്യവാക്ക്" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "യുഎസ്ബി ഡിവൈസുകള്‍ തെരഞ്ഞെടുക്കുക" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "പിന്തുണയില്ലാത്ത ആധികാരികത ഉറപ്പാക്കല്‍ രീതി %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "സ്ക്രീന്‍ഷോട്ട്" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "കണക്ഷന്‍ വിഛേദിയ്ക്കുക" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "യുഎസ്ബി ഡിവൈസ് തെരഞ്ഞെടുക്കല്‍" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "കീ കൂട്ടം അയയ്ക്കുക" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "പൂര്‍ണ്ണസ്ക്രീനില്‍ നിന്നും മാറുക" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(പോയിന്റര്‍ വിടുന്നതിനായി %s അമര്‍ത്തുക)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "ഈ കണക്ഷന്‍ സജ്ജമാക്കുന്നതിനായി കുറഞ്ഞതു് %s പതിപ്പു് %s ആവശ്യമുണ്ടു്" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ വീണ്ടും ആരംഭിയ്ക്കുന്നതിനായി കാത്തിരിയ്ക്കുന്നു" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "%s ഗസ്റ്റിനുള്ള ഗ്രാഫിക് രീതി കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "%s ഗസ്റ്റിനുള്ള ഗ്രാഫിക് വിലാസം കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "ഗസ്റ്റ് %s-നുള്ള ഹോസ്റ്റ് കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "ആരംഭിയ്ക്കുന്നതിനായി libvirt-നു് വേണ്ടി കാത്തിരിയ്ക്കുന്നു" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ കണ്ടുപിടിയ്ക്കുന്നു" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ തയ്യാറാക്കുന്നതിനായി കാത്തിരിയ്ക്കുന്നു" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ %s ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ അവസ്ഥ പരിശോധിയ്ക്കുന്നു" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ ആരംഭിയ്ക്കുന്നതിനായി കാത്തിരിയ്ക്കുന്നു" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ സര്‍വര്‍ ആരംഭിയ്ക്കുന്നതിനായി കാത്തിരിയ്ക്കുന്നു" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "libvrt-ലേക്ക് യുആര്‍ഐ %s ഉപയോഗിച്ചു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[ഒന്നുമില്ല]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_ഫയല്‍" @@ -582,30 +699,78 @@ msgid "Smartcard removal" msgstr "സ്മാര്‍ട്ട്കാര്‍ഡ് നീക്കം ചെയ്യല്‍" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_കാഴ്ച" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "സ്ക്രീന്‍ പൂര്‍ണ്ണവലിപ്പത്തില്‍" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_വലുതാക്കുക" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "പ്രദര്‍ശനങ്ങള്‍" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "കര്‍സര്‍ റിലീസ് ചെയ്യുക" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "കീ _അയയ്ക്കുക" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_സഹായം" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/mn.po b/po/mn.po index 8417dbb..ecb9340 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Mongolian (http://www.transifex.com/projects/p/virt-viewer/language/mn/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Mongolian\n" +"Language: mn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mn\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/mr.po b/po/mr.po index ce274ae..a433be5 100644 --- a/po/mr.po +++ b/po/mr.po @@ -1,25 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # sandeeps , 2010,2012 # sandeeps , 2010,2012-2013 +# sandeeps , 2014 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Marathi (http://www.transifex.com/projects/p/virt-viewer/language/mr/)\n" +"Language-Team: Marathi (http://www.transifex.com/projects/p/virt-viewer/" +"language/mr/)\n" +"Language: mr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mr\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "रिमोट व्युअर" @@ -73,103 +76,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer आवृत्ती %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "आवृत्तीविषयी माहिती दाखवा" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "पटलाचे शीर्षक सेट करा" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "स्पाइस कंट्रोलर संपर्काचा वापर करून जोडणी उघडा" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "दूरस्त व्युअर क्लाएंट" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nउपलब्ध आदेश ओळ पर्यायांची संपूर्ण सूची पहाण्यासाठी '%s --help' चालवा\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"उपलब्ध आदेश ओळ पर्यायांची संपूर्ण सूची पहाण्यासाठी '%s --help' चालवा\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "त्रुटी: स्पाइस् कंट्रोलरचा वापर करतेवेळी अगाऊ घटक दिले\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "त्रुटी: एकापेक्षा जास्त URIs हाताळणे अशक्य\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "जोडणी सुरू करण्यास अपयशी" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "कंट्रोलरतर्फे डिस्पले बंद केले" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "कंट्रोलर जोडणी अपयशी: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "जोडणी तपशील" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "स्पाइस सत्र निर्माण करणे अशक्य" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "स्पाइस सत्राची मांडणी अशक्य..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "अवैध फाइल %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI पासून जोडणी प्रकार ओळखणे अशक्य" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt सत्र उघडणे अशक्य" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "या प्रकारकरीता सत्र निर्माण करणे अशक्य: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "जोडणी तपशील" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "उदाहरणार्थ, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "ग्लेड विषयी" @@ -179,6 +220,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -203,133 +246,164 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora भाषांतरन गट" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "सत्र बंद करायचे?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "मला पुन्हा विचारू नका" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "डिस्पले %d करीता प्रतिक्षा करत आहे..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "अतिथी %s करीता अपरिचीत ग्राफिक प्रकार" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh सह जोडणी अपयशी." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "वाहिनीसह जोडणी करणे अशक्य, SSH फक्त याकरीता समर्थन पुरवतो." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "वाहिनीसह जोडणी असमर्थीत आहे." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "ग्राफिक सर्व्हरसह जोडणी करत आहे" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "अतिथी डोमैन बंद झाले" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "ग्राफिक सर्व्हरसह जोडणी केली" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "ग्राफिक सर्व्हर %s सह जोडणी अशक्य" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s: %s येथे रिमोट डेस्कटॉप सर्व्हरसह ओळख पटवणे अशक्य\nजोडणीकरीता पुन्हा प्रयत्न करायचे?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "रिमोट डेस्कटॉप सर्व्हरसह ओळख पटवणे अशक्य: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB पुनःनिर्देशन त्रुटी: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 +msgstr "झूम स्तर %d-%d अंतर्गत पाहिजे\n" + +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "डिस्पले %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 +msgstr "अवैध kiosk-quit बाब: %s" + +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "पटलाचे झूम स्तर, टक्केवारित" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 +msgstr "पडदाभर मोडमध्ये खुले करा (क्लाएंट घट्ट बसवण्याकरिता अतिथी रेजोल्युशन सुस्थीत करते)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "हॉटकिज पसंतीचे करा" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 +msgstr "किओस्क मोड सुरू करा" + +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 +msgstr "किओस्क मोडमध्ये दिलेल्या अटीवर बाहेर पडा" + +#: ../src/virt-viewer-app.c:2569 msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 +msgstr "" + +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "शब्दात्मक माहिती दाखवा" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "डिबगिंग माहिती दाखवत आहे" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "ओळख पटवणे आवश्यक" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "लेबल" @@ -341,6 +415,14 @@ msgid "Username:" msgstr "वापरकर्तानाव:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,200 +459,236 @@ #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "वर्च्युअल मशीन ग्राफिकल कंसोल" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nवापर: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "रिडायरेक्शनकरीता USB साधने पसंत करा" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "असमर्थीत ओळखपटवणे प्रकार %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+Del (_D)" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+Backspace (_B)" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F1 (_1)" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F2 (_2)" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F3 (_3)" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F4 (_4)" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F5 (_5)" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F6 (_6)" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F7 (_7)" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F8 (_8)" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F9 (_9)" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F10 (_0)" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "स्क्रीनशॉट" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "जोडणी खंडीत करा" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB साधनची निवड" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "कि जोडणी पाठवा" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "पडदाभर सोडा" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(पॉइंटर सोडण्याकरीता %s दाबा)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "ह्या जोडणीच्या सेटअपकरिता किमान %s आवृत्ती %s आवश्यक आहे" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "अतिथी डोमैनला पुनःसुरू करण्यासाठी वाट पहात आहे" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "अतिथी %s करीता ग्राफिक प्रकार ओळखणे अशक्य" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "अतिथी %s करीता ग्राफिक ॲड्रेस ओळखणे अशक्य" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "अतिथी %s करीता यजमान ओळखणे अशक्य" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt सुरू होण्याची वाट पहात आहे" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "अतिथी डोमैन शोधत आहे" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "अतिथी डोमैन निर्माण करण्यास वाट पहात आहे" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "अतिथी क्षेत्र %s शोधणे अशक्य" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "अतिथी डोमैन स्थिती तपासत आहे" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "अतिथी डोमैनला पुनःसुरू करण्यास वाट पहात आहे" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "अतिथी डोमैनला पुनःसुरू करण्यास वाट पहात आहे" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s सह libvirt शी जोडणी करणे अशक्य" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[काहिच नाही]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "फाइल (_F)" @@ -583,30 +701,78 @@ msgid "Smartcard removal" msgstr "स्मार्टकार्ड काढून टाकणे" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "अवलोकन (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "पडदाभर" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "झूम करा (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "डिस्प्लेज्" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "रिलिज् कर्सर" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "सेंड कि (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "मदत (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ms.po b/po/ms.po index 4fd5ec0..2936d4a 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Malay (http://www.transifex.com/projects/p/virt-viewer/language/ms/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Malay\n" +"Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ms\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ms_MY.po b/po/ms_MY.po deleted file mode 100644 index 246cabc..0000000 --- a/po/ms_MY.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/fedora/language/ms_MY/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ms_MY\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/my.po b/po/my.po deleted file mode 100644 index 95a0ea4..0000000 --- a/po/my.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Burmese (http://www.transifex.com/projects/p/virt-viewer/language/my/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: my\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/nb.po b/po/nb.po index 306bc94..f550660 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Kjartan Maraas , 2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/virt-viewer/language/nb/)\n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/virt-" +"viewer/language/nb/)\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -72,103 +74,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Vis versjonsinformasjon" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Åpne tilkobling med Spice-kontroll kommunikasjon" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Klarte ikke å sette opp tilkobling" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Setter opp en Spice-økt…" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Kan ikke bestemme tilkoblingstype fra URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -208,127 +246,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Venter på skjerm %d…" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Ukjent grafikktype for gjest %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Tilkobling til SSH feilet." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Zoom-nivå i vinduer i prosent" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Vis mer informasjon" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Vis feilsøkingsinformasjon" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -338,6 +394,14 @@ #: ../src/virt-viewer-auth.xml.h:4 msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" msgstr "" #: ../src/virt-viewer-main.c:38 @@ -378,198 +442,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Velg USB-enheter for omdirigering" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Koble fra" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Forlat fullskjerm" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Venter på at domene for gjest skal starte på nytt" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Kan ikke bestemme grafikktype for gjest %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Kan ikke bestemme grafikkadresse for gjest %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Kan ikke bestemme vert for gjest %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Finner domene for gjest" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -582,30 +682,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/nds.po b/po/nds.po index 0577be5..113e0ea 100644 --- a/po/nds.po +++ b/po/nds.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Low German (http://www.transifex.com/projects/p/virt-viewer/language/nds/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Low German\n" +"Language: nds\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nds\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ne.po b/po/ne.po index c87e455..0f3930c 100644 --- a/po/ne.po +++ b/po/ne.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Nepali (http://www.transifex.com/projects/p/virt-viewer/language/ne/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Nepali\n" +"Language: ne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ne\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/nl.po b/po/nl.po index 23e14a0..0fb9b04 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Geert Warrink , 2010-2014 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/virt-viewer/language/nl/)\n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/virt-viewer/" +"language/nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Viewer op afstand" @@ -72,103 +74,143 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer versie %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Toon versie informatie" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Stel venstertitel in" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Open verbinding met Spice controller communicatie" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Viewer cliënt op afstand " + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nVoer '%s --help' uit voor een volledige lijst met beschikbare commandoregel opties\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Voer '%s --help' uit voor een volledige lijst met beschikbare commandoregel " +"opties\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Fout: extra argumenten gegeven tijden het gebruik van de Spice controller\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Fout: extra argumenten gegeven tijden het gebruik van de Spice controller\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Fout: kan meerdere URI's niet verwerken\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Verbinding initiëren mislukte" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Display uitgezet door controller" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Controller verbinding mislukte: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Verbindingsdetails" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Kon geen Spice sessie aanmaken" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Spice sessie opzetten..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Ongeldig bestand %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Kan het connectie type niet van URI bepalen" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Kon oVirt sessie niet openen" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Kan sessie niet aanmaken voor dit type: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Verbindingsdetails" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Bijvoorbeeld, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Over Glade" @@ -178,10 +220,13 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Een desktop op afstand cliënt gebouwd met GTK-VNC, SPICE-GTK en libvirt" +msgstr "" +"Een desktop op afstand cliënt gebouwd met GTK-VNC, SPICE-GTK en libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -202,133 +247,166 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Het Fedora vertaal team" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Wil je de sessie afsluiten?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Vraag me dit niet weer" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Wachten op display %d..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Onbekend grafisch type voor de gast %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Verbinden met ssh mislukte." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Kan geen verbinding maken met kanaal, alleen SSH wordt ondersteund" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Verbinding maken met kanaal wordt niet ondersteund." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Verbinding maken met grafische server" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Gast domein werd afgesloten" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Verbonden met grafische server" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Ka niet verbinden met de grafische server %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Kon geen authenticatieverkrijgen met desktop server op afstand op %s: %s\nVerbinding opnieuw proberen?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Kon geen authenticatie verkrijgen met desktop server op afstand: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB omleidingsfout: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Zoom niveau moet tussen %d-%d zijn\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Display %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Ongeldig kiosk-quit argument: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Zoom niveau in percentage van het venster" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Open in volledig-scherm modus (past gastresolutie aan om te passen bij die van de cliënt)." - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Open in volledig-scherm modus (past gastresolutie aan om te passen bij die " +"van de cliënt)." + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Pas sneltoetsen aan" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Zet kiosk modus aan" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Sluit af bij gegeven conditie in kiosk modus" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Toon uitgebreide informatie" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Toon debug informatie" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Authenticatie is vereist" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "label" @@ -340,6 +418,14 @@ msgid "Username:" msgstr "Gebruikersnaam:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -372,204 +458,242 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Voer '%s --help' uit voor een volledige lijst met beschikbare commandoregel opties" +msgstr "" +"Voer '%s --help' uit voor een volledige lijst met beschikbare commandoregel " +"opties" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "Virtuele machine grafische console" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nGebruik: %s [OPTIES] DOMEIN-NAAM|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "ongeldig wachtwoord" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Selecteer USB apparaten voor omleiding" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Niet-ondersteund authenticatie type %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Schermafdruk" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Verbinding verbreken" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB apparaat selectie" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Stuur sleutel combinatie" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Verlaat volledig scherm" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Druk op %s om wijzer vrij te geven)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "%s versie %s is tenminste vereist om deze verbinding in te stellen" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Wacht tot gast domein opnieuw opgestart wordt" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Kan het grafische type voor de gast %s niet bepalen" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Kan het grafische adres voor de gast %s niet bepalen" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Kan de host voor de gast %s niet bepalen" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Wacht op het opstarten van libvirt" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Zoek naar gast domein" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Wacht tot gast domein aangemaakt is" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Kan gast domein %s niet vinden" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Controleer gast domein status" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Wacht tot gast domein gestart wordt" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Wacht tot gast domein de server opstart" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Kan niet verbinden met libvirt met URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[geen]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Bestand" @@ -582,30 +706,78 @@ msgid "Smartcard removal" msgstr "Verwijder Smartcard" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_View" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Volledig scherm" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Zoom" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Displays" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Geef cursor vrij" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Stuur sleutel" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Hulp" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/nn.po b/po/nn.po index 164b48c..ccd693c 100644 --- a/po/nn.po +++ b/po/nn.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/virt-viewer/language/nn/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Norwegian Nynorsk\n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nn\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/no.po b/po/no.po deleted file mode 100644 index adb6658..0000000 --- a/po/no.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Norwegian (http://www.transifex.com/projects/p/virt-viewer/language/no/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: no\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/nso.po b/po/nso.po index 115d008..719e951 100644 --- a/po/nso.po +++ b/po/nso.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Northern Sotho (http://www.transifex.com/projects/p/virt-viewer/language/nso/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Northern Sotho\n" +"Language: nso\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nso\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/or.po b/po/or.po index 4e92be8..a0d2354 100644 --- a/po/or.po +++ b/po/or.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Manoj Kumar Giri , 2010,2012-2014 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Oriya (http://www.transifex.com/projects/p/virt-viewer/language/or/)\n" +"Language-Team: Oriya (http://www.transifex.com/projects/p/virt-viewer/" +"language/or/)\n" +"Language: or\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: or\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "ସୁଦୂର ପ୍ରଦର୍ଶିକା" @@ -72,103 +74,142 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer ସଂସ୍କରଣ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "ସଂସ୍କରଣ ସୂଚନା ଦେଖାନ୍ତୁ" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "ୱିଣ୍ଡୋ ଶୀର୍ଷକ ସେଟ କରନ୍ତୁ" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "ସ୍ପାଇସ ନିୟନ୍ତ୍ରକ ଯୋଗାଯୋଗ ମାଧ୍ଯମରେ ସଂଯୋଗକୁ ଖୋଲନ୍ତୁ" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nଉପଲବ୍ଧ ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ ବିକଳ୍ପର ସଂପୂର୍ଣ୍ଣ ତାଲିକା ଦେଖିବା ପାଇଁ '%s --help' କୁ ଚଳାନ୍ତୁ\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"ଉପଲବ୍ଧ ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ ବିକଳ୍ପର ସଂପୂର୍ଣ୍ଣ ତାଲିକା ଦେଖିବା ପାଇଁ '%s --help' କୁ ଚଳାନ୍ତୁ\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "ତ୍ରୁଟି: ଅତିରିକ୍ତ ସ୍ୱତନ୍ତ୍ରଚରଗୁଡ଼ିକ ଦିଆଯାଇଥାଏ ଯେତେବେଳେ ସ୍ପାଇସ ନିୟନ୍ତ୍ରକ ବ୍ୟବହାର କରାଯାଇଥାଏ\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"ତ୍ରୁଟି: ଅତିରିକ୍ତ ସ୍ୱତନ୍ତ୍ରଚରଗୁଡ଼ିକ ଦିଆଯାଇଥାଏ ଯେତେବେଳେ ସ୍ପାଇସ ନିୟନ୍ତ୍ରକ ବ୍ୟବହାର କରାଯାଇଥାଏ\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "ତ୍ରୁଟି: ଏକାଧିକ URI ଗୁଡ଼ିକୁ ନିୟନ୍ତ୍ରଣ କରିପାରିବେ ନାହିଁ\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr " ସଂଯୋଗ ଆରମ୍ଭ କରିବାରେ ବିଫଳ" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "ନିୟନ୍ତ୍ରକ ଦ୍ୱାରା ପ୍ରଦର୍ଶନୀ ନିଷ୍କ୍ରିୟ ହୋଇଛି" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "ନିୟନ୍ତ୍ରକ ସଂଯୋଗ ଅସଫଳ ହେଲା:%s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "ସଂଯୋଗ ବିବରଣୀ" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "ସ୍ପାଇସ ଅଧିବେଶନ ପ୍ରସ୍ତୁତ ହୋଇପାରିଲା ନାହିଁ" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "ସ୍ପାଇସ ଅଧିବେଶନ ସେଟ କରୁଅଛି..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "ଅବୈଧ ଫାଇଲ %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI ରୁ ସଂଯୋଗ ପ୍ରକାରକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବେ ନାହିଁ" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt ଅଧିବେଶନକୁ ଖୋଲିପାରିଲା ନାହିଁ" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "ଏହି ପ୍ରକାର ପାଇଁ ସ୍ପାଇସ ଅଧିବେଶନ ପ୍ରସ୍ତୁତ ହୋଇପାରିଲା ନାହିଁ: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "ସଂଯୋଗ ବିବରଣୀ" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "ଗ୍ଲେଡ ବିଷୟରେ" @@ -181,7 +222,8 @@ #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "GTK-VNC, SPICE-GTK ଏବଂ libvirt ସହାୟତାରେ ଏକ ସୁଦୂର ଡେସ୍କଟପ କ୍ଲାଏଣ୍ଟ ପ୍ରସ୍ତୁତ ହୋଇଛି" +msgstr "" +"GTK-VNC, SPICE-GTK ଏବଂ libvirt ସହାୟତାରେ ଏକ ସୁଦୂର ଡେସ୍କଟପ କ୍ଲାଏଣ୍ଟ ପ୍ରସ୍ତୁତ ହୋଇଛି" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -202,133 +244,164 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora ଅନୁବାଦନ ଗୋଷ୍ଠି" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "ଆପଣ ଅଧିବେଶନକୁ ବନ୍ଦ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "ମୋତେ ପୁନର୍ବାର ପଚାରନ୍ତୁ ନାହିଁ" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "%d କୁ ଅପେକ୍ଷା କରିଅଛି..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "ଅତିଥି %s ପାଇଁ ଅଜ୍ଞାତ ଲେଖାଚିତ୍ର ପ୍ରକାର" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh ସହିତ ସଂଯୋଗ ବିଫଳ ହୋଇଛି।" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "ଚ୍ୟାନେଲ ସହିତ ସଂଯୋଗ କରିପାରିବେ ନାହିଁ, କେବଳ SSH ସମର୍ଥିତ।" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "ଚ୍ୟାନେଲ ସହିତ ସଂଯୋଗ ଅସମର୍ଥିତ।" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "ଆଲେଖିକ ସର୍ଭର ସହିତ ସଂଯୋଗ କରୁଅଛି" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "ଅତିଥି ଡମେନ ବନ୍ଦ ଅଛି" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "ଆଲେଖି ସର୍ଭର ସହ ସଂଯୁକ୍ତ" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "ଆଲେଖୀ ସର୍ଭର %s ସହିତ ସଂଯୋଗ କରିବାରେ ଅସମର୍ଥ" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s ରେ ସୁଦୂର ଡେସ୍କଟପ ସର୍ଭର ସହିତ ବୈଧିକରଣ କରିବାରେ ଅସମର୍ଥ: %s\nପୁଣିଥରେ ଚେଷ୍ଟା କରିବେ କି?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "ସୁଦୂର ଡେସ୍କଟପ ସର୍ଭର ସହିତ ବୈଧିକରଣ କରିବାରେ ଅସମର୍ଥ: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB ଦିଗପରିବର୍ତ୍ତନ ତ୍ରୁଟି: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "ଆକାର ବୃଦ୍ଧି ସ୍ତର ନିଶ୍ଚିତ ଭାବରେ %d-%d ମଧ୍ଯରେ ରହିବା ଉଚିତ\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d ଦର୍ଶାଅ" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "ଅବୈଧ kiosk-quit ସ୍ୱତନ୍ତ୍ରଚର: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "ୱିଣ୍ଡୋର ଆକାର ବୃଦ୍ଧି ସ୍ତର, ଶତକଡ଼ାରେ" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "ସମ୍ପୂର୍ଣ୍ଣ ପରଦା ଧାରାରେ ଖୋଲନ୍ତୁ (ଅତିଥି ବିଭେଦନକୁ କ୍ଲାଏଣ୍ଟ ସହିତ ମେଳାଇଥାଏ)।" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "ହଟ-କିଗୁଡ଼ିକୁ ଇଚ୍ଛାମୁତାବକ କରନ୍ତୁ" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "kiosk ଧାରାକୁ ସକ୍ରିୟ କରନ୍ତୁ" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "kiosk ଧାରାରେ ଦିଆଯାଇଥିବା ସର୍ତ୍ତରେ ବିଦାୟ ନିଅନ୍ତୁ" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "ଶବ୍ଦାଡ଼ମ୍ବରପୂର୍ଣ୍ଣ ସୂଚନା ଦର୍ଶାନ୍ତୁ" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ତ୍ରୁଟିନିବାରଣ ସୂଚନା ଦର୍ଶାନ୍ତୁ" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "ବୈଧିକରଣ ଆବଶ୍ଯକ" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "ନାମପଟି" @@ -340,6 +413,14 @@ msgid "Username:" msgstr "ଚାଳକ ନାମ:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -378,198 +459,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nବ୍ୟବହାର ବିଧି: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "ଅବୈଧ ପ୍ରବେଶ ସଂକେତ" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "ଦିଗ ପରିବର୍ତ୍ତନ ପାଇଁ USB ଉପକରଣଗୁଡ଼ିକୁ ବାଛନ୍ତୁ" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "ଅସମର୍ଥିତ ପ୍ରାଧିକରଣ ପ୍ରକାର %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "ଆଶୁଚିତ୍ର" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB ଉପକରଣ ଚୟନ" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "କି ଯୁଗଳକୁ ପଠାନ୍ତୁ" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "ସମ୍ପୁର୍ଣ୍ଣ ପରଦା ଛାଡ଼ି ଦିଅନ୍ତୁ" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(ସୂଚକକୁ ଛାଡ଼ିବା ପାଇଁ %s କୁ ଦବାନ୍ତୁ)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "ଏହି ସଂଯୋଗକୁ ବ୍ୟବସ୍ଥା କରିବା ପାଇଁ ଅତିକମରେ %s ସଂସ୍କରଣ %s ଆବଶ୍ୟକ କରିଥାଏ" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "ପୁନଚାଳନ ପାଇଁ ଅତିଥି ଡମେନକୁ ଅପେକ୍ଷା କରିଛି" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "ଅତିଥି %s ପାଇଁ ଆଲେଖିକ ପ୍ରକାରକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବେ ନାହିଁ" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "ଅତିଥି %s ପାଇଁ ଆଲେଖିକ ଠିକଣାକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବେ ନାହିଁ" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "ଅତିଥି %s ପାଇଁ ହୋଷ୍ଟ ନିର୍ଦ୍ଧାରଣ କରିପାରିବେ ନାହିଁ" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt କୁ ଆରମ୍ଭ ହେବା ପାଇଁ ଅପେକ୍ଷା କରୁଅଛି" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "ଅତିଥି ଡମେନକୁ ଖୋଜୁଅଛି" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "ନିର୍ମାଣ କରିବା ପାଇଁ ଅତିଥି ଡମେନକୁ ଅପେକ୍ଷା କରିଛି" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "ଅତିଥି ଡମେନ %s କୁ ଖୋଜି ପାଇବେ ନାହିଁ" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "ଅତିଥି ଡମେନ ସ୍ଥିତିକୁ ଯାଞ୍ଚ କରୁଅଛି" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "ଅତିଥି ଡମେନ ଆରମ୍ଭ ହେବାକୁ ଯାଉଛି" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "ସର୍ଭରକୁ ଆରମ୍ଭ କରିବା ପାଇଁ ଅତିଥି ଡମେନକୁ ଅପେକ୍ଷା କରିଛି" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %s ସହାୟତାରେ libvirt ସହିତ ସଂଯୋଗ କରିବାରେ ଅସମର୍ଥ" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[କିଛି ନାହିଁ]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ଫାଇଲ (_F)" @@ -582,30 +699,78 @@ msgid "Smartcard removal" msgstr "ସ୍ମାର୍ଟକାର୍ଡ ବାହାର କରିବା " -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "ଦୃଶ୍ଯ (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "ସଂପୂର୍ଣ୍ଣ ପରଦା" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "ବଡ଼ କରନ୍ତୁ (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "ପ୍ରଦର୍ଶନୀ" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "ସୂଚକକୁ ଛାଡ଼ନ୍ତୁ" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "କି ପଠାନ୍ତୁ (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "ସହାୟତା (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/pa.po b/po/pa.po index 13975a7..93b36d8 100644 --- a/po/pa.po +++ b/po/pa.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Amandeep Singh Saini , 2013 # Jaswinder Singh , 2010,2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/virt-viewer/language/pa/)\n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/virt-" +"viewer/language/pa/)\n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "ਰਿਮੋਟ ਦਰਸ਼ਕ" @@ -73,103 +75,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer ਸੰਸਕਰਣ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "ਸੰਸਕਰਣ ਜਾਣਕਾਰੀ ਵਿਖਾਓ" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "ਵਿੰਡੋ ਦਾ ਸਿਰਲੇਖ ਨਿਰਧਾਰਿਤ ਕਰੋ" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "ਸਪਾਈਸ ਕੰਟਰੋਲਰ ਕਮਿਊਨੀਕੇਸ਼ਨ ਵਰਤ ਕੇ ਸੰਪਰਕ ਖੋਲ੍ਹੋ" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nਪੂਰੀਆਂ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਵਾਸਤੇ '%s --help' ਚਲਾਉ\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"ਪੂਰੀਆਂ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਵਾਸਤੇ '%s --help' ਚਲਾਉ\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "ਗਲਤੀ: ਸਪਾਈਸ ਕੰਟਰੋਲਰ ਵਰਤਣ ਵੇਲੇ ਜਿਆਦਾ ਆਰਗੂਮੈਂਟ ਦਿੱਤੇ ਸੀ\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "ਗਲਤੀ: ਬਹੁਤੇ URIs ਨਹੀਂ ਲੈ ਸਕਦਾ\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "ਸੰਪਰਕ ਚਾਲੂ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "ਕੰਟਰੋਲਰ ਦੁਆਰਾ ਪ੍ਰਦਰਸ਼ਨ ਅਯੋਗ ਕੀਤਾ ਹੈ" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "ਕੰਟਰੋਲਰ ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ ਹੋਇਆ: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵੇ" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "ਸਪਾਈਸ ਸੈਸ਼ਨ ਬਣਾ ਨਹੀਂ ਸਕਿਆ" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "ਸਪਾਈਸ ਸੈਸ਼ਨ ਬਣਾ ਰਿਹਾ ਹੈ..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "ਅਯੋਗ ਫਾਈਲ %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt ਸੈਸ਼ਨ ਨਹੀਂ ਖੋਲ੍ਹ ਸਕਿਆ" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "ਇਸ ਕਿਸਮ ਲਈ ਸ਼ੈਸ਼ਨ ਨਹੀਂ ਬਣਾ ਸਕਿਆ: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵੇ" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "ਗਲੇਡ ਬਾਰੇ" @@ -203,133 +243,164 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "ਇਹ ਪਰੋਗਰਾਮ ਫਰੀ ਸਾਫਟਵੇਅਰ ਹੈ; ਤੁਸੀਂ ਇਸਨੂੰ ਮੁੜ-ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਕਰ ਸਕਦੇ ਹੋ\nGNU ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸੰਸ ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ ਜੋ ਫਰੀ\nਸਾਫਟਵੇਅਰ ਫਾਊਂਡੇਸ਼ਨ ਦੁਆਰਾ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ; ਲਾਈਸੰਸ ਦਾ ਸੰਸਕਰਣ 2, ਜਾਂ\n(ਤੁਹਾਡੀ ਚੋਣ ਮੁਤਾਬਕ) ਕੋਈ ਬਾਅਦ ਵਾਲਾ ਸੰਸਕਰਣ\n\nਇਹ ਪਰੋਗਰਾਮ ਇਸ ਉਦੇਸ਼ ਨਾਲ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ ਕਿ ਇਹ ਵਰਤਣਯੋਗ ਹੋਵੇਗਾ,\nਪਰ ਕਿਨਾਂ ਕਿਸੇ ਵਾਰੰਟੀ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਬਿਨਾਂ ਕਿਸੇ ਵਪਾਰਿਕਤਾ ਵਾਰੰਟੀ\nਜਾਂ ਕਿਸੇ ਖਾਸ ਉਦੇਸ਼ ਦੀ ਪੂਰਤੀ ਲਈ। ਵਧੇਰੇ ਵਿਸਥਾਰ ਲਈ\nGNU ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸੰਸ ਵੇਖੋ।\n\nਤੁਹਾਨੂੰ ਇਸ ਪਰੋਗਰਾਮ ਨਾਲ GNU ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸੰਸ ਦੀ ਕਾਪੀ\nਮਿਲਣੀ ਚਾਹੀਦੀ ਹੈ; ਜੇ ਨਹੀਂ, ਤਾਂ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਈਊਨਡੇਸ਼ਨ,\nInc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ਨੂੰ ਲਿਖੋ\n" +msgstr "" +"ਇਹ ਪਰੋਗਰਾਮ ਫਰੀ ਸਾਫਟਵੇਅਰ ਹੈ; ਤੁਸੀਂ ਇਸਨੂੰ ਮੁੜ-ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਕਰ ਸਕਦੇ ਹੋ\n" +"GNU ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸੰਸ ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ ਜੋ ਫਰੀ\n" +"ਸਾਫਟਵੇਅਰ ਫਾਊਂਡੇਸ਼ਨ ਦੁਆਰਾ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ; ਲਾਈਸੰਸ ਦਾ ਸੰਸਕਰਣ 2, ਜਾਂ\n" +"(ਤੁਹਾਡੀ ਚੋਣ ਮੁਤਾਬਕ) ਕੋਈ ਬਾਅਦ ਵਾਲਾ ਸੰਸਕਰਣ\n" +"\n" +"ਇਹ ਪਰੋਗਰਾਮ ਇਸ ਉਦੇਸ਼ ਨਾਲ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ ਕਿ ਇਹ ਵਰਤਣਯੋਗ ਹੋਵੇਗਾ,\n" +"ਪਰ ਕਿਨਾਂ ਕਿਸੇ ਵਾਰੰਟੀ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਬਿਨਾਂ ਕਿਸੇ ਵਪਾਰਿਕਤਾ ਵਾਰੰਟੀ\n" +"ਜਾਂ ਕਿਸੇ ਖਾਸ ਉਦੇਸ਼ ਦੀ ਪੂਰਤੀ ਲਈ। ਵਧੇਰੇ ਵਿਸਥਾਰ ਲਈ\n" +"GNU ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸੰਸ ਵੇਖੋ।\n" +"\n" +"ਤੁਹਾਨੂੰ ਇਸ ਪਰੋਗਰਾਮ ਨਾਲ GNU ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸੰਸ ਦੀ ਕਾਪੀ\n" +"ਮਿਲਣੀ ਚਾਹੀਦੀ ਹੈ; ਜੇ ਨਹੀਂ, ਤਾਂ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਈਊਨਡੇਸ਼ਨ,\n" +"Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ਨੂੰ ਲਿਖੋ\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "ਫੇਡੋਰਾ ਅਨੁਵਾਦ ਟੀਮ" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "ਕੀ ਤੁਸੀਂ ਸੈਸ਼ਨ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "ਮੈਨੂੰ ਦੁਬਾਰਾ ਨਾ ਪੁੱਛਿਓ" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "ਝਲਕ %d ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "ਪ੍ਰਾਹੁਣੇ %s ਲਈ ਗਰਾਫਿਕਸ ਕਿਸਮ ਅਣਪਛਾਤੀ ਹੈ" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh ਨਾਲ ਜੁੜਨ ਤੋਂ ਅਸਫਲ ਹੋਇਆ।" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "ਚੈਨਲ ਨਾਲ ਜੁੜ ਨਹੀਂ ਸਕਦਾ, ਸਿਰਫ SSH ਸਮਰਥਿਤ ਹੈ।" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "ਚੈਨਲ ਨਾਲ ਜੁੜਨ ਨੂੰ ਸਮਰਥਨ ਨਹੀਂ ਹੈ।" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "ਗਰਾਫਿਕਸ ਸਰਵਰ ਨਾਲ ਜੁੜ ਰਿਹਾ ਹੈ" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਸ਼ੱਟ-ਡਾਊਨ ਹੋ ਗਿਆ ਹੈ" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "ਗਰਾਫਿਕਸ ਸਰਵਰ ਨਾਲ ਜੁੜ ਗਿਆ" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "ਗਰਾਫਿਕਸ ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਤੋਂ ਅਸਮਰਥ" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s ਤੋਂ ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਤੋਂ ਅਸਮਰਥ: %s\nਸੰਪਰਕ ਦੀ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "ਰਿਮੋਟ ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਤੋਂ ਅਸਮਰਥ: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB ਰੀਡਾਇਰੈਕਸ਼ਨ ਗਲਤੀ: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "ਜ਼ੂਮ ਪੱਧਰ %d-%d ਵਿਚਕਾਰ ਹੋਣਾ ਜਰੂਰੀ ਹੈ\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "ਡਿਸਪਲੇਅ %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "ਅਯੋਗ kiosk-quit ਆਰਗੂਮੈਂਟ: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "ਵਿੰਡੋ ਦਾ ਜ਼ੂਮ ਪੱਧਰ, ਪ੍ਰਤੀਸ਼ਤ ਵਿੱਚ" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "hotkeys ਚੁਣਿੰਦਾਪਨ ਕਰੋ" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "kiosk ਮੋਡ ਯੋਗ ਕਰੋ" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "kiosk ਮੋਡ ਵਿੱਚ ਦਿੱਤੀ ਗਈ ਸਥਿਤੀ ਆਉਣ ਤੇ ਛੱਡ ਦਿਓ" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "ਵਰਬੋਜ਼ ਜਾਣਕਾਰੀ ਵਿਖਾਓ" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "ਡੀਬੱਗਿੰਗ ਜਾਣਕਾਰੀ ਵਿਖਾਓ" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਲੋੜੀਂਦੀ ਹੈ" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "ਲੇਬਲ" @@ -341,6 +412,14 @@ msgid "Username:" msgstr "ਯੂਜ਼ਰ ਨਾਂ:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -379,198 +458,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nਵਰਤੋਂ: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "ਅਯੋਗ ਗੁਪਤ-ਸ਼ਬਦ" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "ਰੀਡਾਇਰੈਕਸ਼ਨ ਲਈ USB ਜੰਤਰ ਚੁਣੋ" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "ਅਸਮਰਥਿਤ ਪ੍ਰਮਾਣਿਕਤਾ ਕਿਸਮ %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "ਸੰਪਰਕ ਤੋੜੋ" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB ਜੰਤਰ ਚੋਣ" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "ਚਾਬੀ ਮਿਸ਼ਰਨ ਭੇਜੋ" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "ਪੂਰੀ ਸਕਰੀਨ ਛੱਡੋ" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(ਪੁਆਇੰਟਰ ਛੱਡਣ ਲਈ %s ਦੱਬੋ)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "ਇਸ ਸੰਪਰਕ ਦੇ ਸੈੱਟਅੱਪ ਲਈ ਘੱਟੋ-ਘੱਟ %s ਸੰਸਕਰਣ %s ਲੋੜੀਂਦਾ ਹੈ" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "ਪ੍ਰਾਹੁਣਾ %s ਲਈ ਗਰਾਫਿਕ ਕਿਸਮ ਪਤਾ ਨਹੀਂ ਕਰ ਸਕਦਾ" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "ਪ੍ਰਾਹੁਣਾ %s ਲਈ ਗਰਾਫਿਕਸ ਸਿਰਨਾਵਾਂ ਪਤਾ ਨਹੀਂ ਕਰ ਸਕਿਆ" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "ਪ੍ਰਾਹੁਣਾ %s ਲਈ ਹੋਸਟ ਪਤਾ ਨਹੀਂ ਕਰ ਸਕਦਾ" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਲੱਭ ਰਿਹਾ ਹੈ" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੇ ਬਣਾਏ ਜਾਣ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ %s ਨਹੀਂ ਲੱਭ ਸਕਿਆ" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੀ ਹਾਲਤ ਜਾਂਚ ਰਿਹਾ ਹੈ" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੇ ਚਾਲੂ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "ਗੈੱਸਟ ਡੋਮੇਨ ਦੁਆਰਾ ਸਰਵਰ ਚਾਲੂ ਕਰਨ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "libvirt ਨੂੰ URI %s ਨਾਲ ਜੋੜ ਨਹੀਂ ਸਕਿਆ" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[ਕੋਈ ਨਹੀਂ]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ਫਾਈਲ (_F)" @@ -583,30 +698,78 @@ msgid "Smartcard removal" msgstr "ਸਮਾਰਡ-ਕਾਰਡ ਹਟਾਉਣਾ" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "ਵੇਖੋ (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "ਪੂਰਾ ਪਰਦਾ" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "ਜ਼ੂਮ (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਦਾ ਹੈ" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "ਕਰਸਰ ਛੱਡੋ" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "ਕੁੰਜੀ ਭੇਜੋ (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "ਮਦਦ (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/pl.po b/po/pl.po index be9c8df..5308df9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,24 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Piotr Drąg , 2010,2012-2014 +# Piotr Drąg , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/virt-viewer/language/pl/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-12-07 10:36-0500\n" +"Last-Translator: Piotr Drąg \n" +"Language-Team: Polish (http://www.transifex.com/projects/p/virt-viewer/" +"language/pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Zdalne przeglądanie" @@ -72,103 +76,142 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer wersja %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "remote-viewer w wersji %s" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Wyświetla informację o wersji" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Ustawia tytuł okna" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Otwiera połączenie używając komunikacji kontrolera Spice" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Klient zdalnej przeglądarki" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nWykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji wiersza poleceń\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza " +"poleceń\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "Błąd: podano dodatkowe parametry podczas używania kontrolera Spice\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Błąd: nie można obsłużyć wielu adresów URI\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Zainicjowanie połączenia się nie powiodło" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Ekran został wyłączony przez kontroler" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Połączenie kontrolera się nie powiodło: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Szczegóły połączenia" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "_Zmień płytę CD" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "przetworzenie adresu URI oVirt się nie powiodło" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "Anulowano uwierzytelnianie" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "Maszyna wirtualna oVirt %s nie jest uruchomiona" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "Maszyna wirtualna oVirt %s nie posiada ekranu" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "Maszyna wirtualna oVirt %s nie posiada informacji o komputerze" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Nie można utworzyć sesji Spice" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "Maszyna wirtualna oVirt %s posiada nieznany typ ekranu: %d" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." -msgstr "Ustawianie sesji Spice..." - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Nieprawidłowy plik %s" - -#: ../src/remote-viewer.c:1062 +msgstr "Ustawianie sesji Spice…" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "Nie wybrano połączenia" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "Nieprawidłowy plik %s: " + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Nie można ustalić typu połączenia z adresu URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Nie można utworzyć sesji oVirt" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Nie można utworzyć sesji dla tego typu: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "Nie można otworzyć sesji oVirt: " + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Szczegóły połączenia" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "Adres połączenia" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Na przykład spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "Ostatnie połączania" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "Anuluj" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "Połącz" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "O programie Glade" @@ -178,10 +221,14 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright © 2007-2012 Daniel P. Berrange\n" +"Copyright © 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Klient zdalnego pulpitu zbudowany za pomocą bibliotek GTK-VNC, SPICE-GTK i libvirt" +msgstr "" +"Klient zdalnego pulpitu zbudowany za pomocą bibliotek GTK-VNC, SPICE-GTK i " +"libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -202,133 +249,174 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\ni/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\nprzez Fundację Wolnego Oprogramowania (Free Software Foundation) - według\nwersji drugiej tej Licencji lub którejś z późniejszych wersji.\n\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny\n- jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\nPRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu\nuzyskania bliższych informacji należy zapoznać się z Powszechną Licencją\nPubliczną GNU.\n\nZ pewnością wraz z niniejszym programem dostarczono także egzemplarz\nPowszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n- proszę napisać do Free Software Foundation, Inc., 59 Temple Place, Suite\n330, Boston, MA 02111-1307 USA.\n" +msgstr "" +"Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\n" +"i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\n" +"przez Fundację Wolnego Oprogramowania (Free Software Foundation) — według\n" +"wersji drugiej tej Licencji lub którejś z późniejszych wersji.\n" +"\n" +"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny\n" +"— jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n" +"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu\n" +"uzyskania bliższych informacji należy zapoznać się z Powszechną Licencją\n" +"Publiczną GNU.\n" +"\n" +"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n" +"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n" +"— proszę napisać do Free Software Foundation, Inc., 59 Temple Place, Suite\n" +"330, Boston, MA 02111-1307 USA.\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Zespół tłumaczenia Fedory" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Zamknąć sesję?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Bez pytania ponownie" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." -msgstr "Oczekiwanie na ekran %d..." - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Nieznany typ grafiki dla gościa %s" - -#: ../src/virt-viewer-app.c:1027 +msgstr "Oczekiwanie na ekran %d…" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "Nieobsługiwany typ grafiki ”%s”" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Połączenie z ssh się nie powiodło." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Nie można połączyć się z kanałem, obsługiwane jest tylko SSH." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Łączenie z kanałem jest nieobsługiwane." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" +"Ekran może zostać podłączony tylko przez bibliotekę libvirt za pomocą opcji " +"--attach" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Łączenie z serwerem grafiki" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Domena gościa została wyłączona" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Połączono z serwerem grafiki" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Nie można połączyć się z serwerem grafiki %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Nie można uwierzytelnić z serwerem zdalnego pulpitu w %s: %s\nPonowić połączenie?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "Nie można uwierzytelnić ze zdalnym serwerem pulpitu w %s: %s\n" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Nie można uwierzytelnić z serwerem zdalnego pulpitu: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Błąd przekierowania USB: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Poziom powiększenia musi być w zakresie %d-%d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Ekran %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Nieprawidłowy parametr kiosk-quit: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Poziom powiększenia okna, w procentach" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Otwiera w trybie pełnoekranowym (dostosowuje rozdzielczość gościa, aby pasowała do klienta)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Otwiera w trybie pełnoekranowym (dostosowuje rozdzielczość gościa, aby " +"pasowała do klienta)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Dostosowuje skróty" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Włącza tryb kiosku" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Kończy działanie po podanym warunku w trybie kiosku" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 +msgstr "" + +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Wyświetla więcej informacji" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Wyświetla informacje o debugowaniu" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" +"Wymagane jest uwierzytelnienie dla połączenia %s, aby:\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "Wymagane jest uwierzytelnienie dla połączenia %s:\n" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Wymagane jest uwierzytelnienie" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "etykieta" @@ -340,10 +428,18 @@ msgid "Username:" msgstr "Nazwa użytkownika:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "Wyświetlanie hasła" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "VNC nie podaje GUID" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" -msgstr "%s wersja %s\n" +msgstr "%s w wersji %s\n" #: ../src/virt-viewer-main.c:62 msgid "Direct connection with no automatic tunnels" @@ -372,240 +468,335 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji wiersza poleceń" +msgstr "" +"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza poleceń" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "Graficzna konsola maszyny wirtualnej" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nUżycie: %s [OPCJE] NAZWA-DOMENY|IDENTYFIKATOR|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" +"\n" +"Użycie: %s [OPCJE] [NAZWA-DOMENY|ID|UUID]\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" +"\n" +"Nie podano NAZWY-DOMENY|ID|UUID dla parametru „--wait”\n" +"\n" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "Nieprawidłowe hasło" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Wybór urządzeń USB do przekierowania" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Nieobsługiwany typ uwierzytelnienia %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "Nie odnaleziono żadnej maszyny wirtualnej" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "Nie wybrano maszyny wirtualnej" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Zrzut ekranu" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "Nieznane" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Rozłącza" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Wybór urządzenia USB" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Wysyła kombinację klawiszy" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Opuszcza pełny ekran" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Naciśnięcie klawiszy %s uwalnia wskaźnik)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" -msgstr "%s%s%s - %s" +msgstr "%s%s%s — %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" +"Wymagane jest %s co najmniej w wersji %s, aby ustawić to połączenie. Więcej " +"informacji: %s" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "Wymagane jest %s co najmniej w wersji %s, aby ustawić to połączenie" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Oczekiwanie na ponowne uruchomienie domeny gościa" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Nie można określić typu grafiki dla gościa %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Nie można określić adresu grafiki dla gościa %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Nie można określić gospodarza dla gościa %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "Nie można uzyskać dostępu do gościa „%s”" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "Maszyna wirtualna %s nie jest uruchomiona" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Oczekiwanie na uruchomienie biblioteki libvirt" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Wyszukiwanie domeny gościa" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Oczekiwanie na utworzenie domeny gościa" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Nie można odnaleźć domeny gościa %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Sprawdzanie stanu domeny gościa" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "Nie można uzyskać stanu gościa" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Oczekiwanie na uruchomienie domeny gościa" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Oczekiwanie na uruchomienie serwera domeny gościa" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Nie można połączyć się z biblioteką libvirt za pomocą adresu URL %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "Nie można połączyć się z biblioteką libvirt za pomocą adresu URI: %s." + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[brak]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "Uwierzytelnienie się nie powiodło." + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "Połączenie się nie powiodło: " + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Plik" #: ../src/virt-viewer.xml.h:4 msgid "Smartcard insertion" -msgstr "Włożenie karty smart card" +msgstr "Włożenie karty smartcard" #: ../src/virt-viewer.xml.h:5 msgid "Smartcard removal" -msgstr "Usunięcie karty smart card" - -#: ../src/virt-viewer.xml.h:6 +msgstr "Usunięcie karty smartcard" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "Preferencje" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Widok" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Pełny ekran" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "P_owiększenie" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Ekrany" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Zwolnienie kursora" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "Wyślij klawi_sz" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "Pomo_c" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "_Informacje o gościu" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "Informacje o gościu" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "Nazwa:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "Wybór maszyny wirtualnej" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "Nazwa" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "Dostępne maszyny wirtualne" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "Współdzielenie katalogów" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "Współdziel katalog" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "Tylko do odczytu" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "Spice" diff --git a/po/pt.po b/po/pt.po index 5908463..2b15fd7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Pedro Marques Daniel , 2013 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Portuguese (http://www.transifex.com/projects/p/virt-viewer/language/pt/)\n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/virt-viewer/" +"language/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -72,103 +74,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -208,127 +246,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -340,6 +396,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -378,198 +442,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -582,30 +682,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 350b61b..9a5173d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,27 +1,30 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Glaucia Freitas , 2012 # Glaucia Freitas , 2012-2013 # Marcelo Barbosa , 2013 # Paulo Sergio Klaus , 2014 +# Marco Aurélio Krause , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/virt-viewer/language/pt_BR/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-10-28 04:11-0400\n" +"Last-Translator: Marco Aurélio Krause \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/virt-" +"viewer/language/pt_BR/)\n" +"Language: pt-BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Visualizador remoto" @@ -75,103 +78,143 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "versão remote-viewer %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Exibir informações de versão" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Setando título da janela" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Abrir conexão usando a comunicação do controlador Spice" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Visualizador remoto" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nExecute '%s --help' para ver uma lista completa de opções de linhas de comando disponíveis\n\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Execute '%s --help' para ver uma lista completa de opções de linhas de " +"comando disponíveis\n" +"\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "Erro: argumentos extras passados ao usar o controlador Spice\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Erro: não é possível manipular múltiplas URIs\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Falha ao iniciar a conexão " -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Exibir desabilitado pelo controlador" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Conexão de controlador falhou:%s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Detalhes da conexão" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "Alterar _CD" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Não foi possível criar uma sessão Spice" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Configurando uma sessão Spice" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Arquivo inválido %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Não foi possíve determinar o tipo de conexão a partir do URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Não foi possível abrir a sessão oVirt" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Não foi possível criar uma sessão para este tpo: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Detalhes da conexão" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Por exemplo, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Sobre o Glade" @@ -181,10 +224,13 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Um cliente de desktop remoto construído com o GTK-VNC, SPICE-GTK e libvirt" +msgstr "" +"Um cliente de desktop remoto construído com o GTK-VNC, SPICE-GTK e libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -205,133 +251,166 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos do GNU - General Public License como publicado pela Fundação de Software Livre; tanto a versão 2 da Licensa quanto (na sua opinião) qualquer versão posterior a esta.\n\nEste programa é distribuído esperando que seja útiil, \nmas SEM NENHUMA GARANTIA; sem até mesmo a garantia implicada de MERCANTIBILIDADE ou SERVIÇO PARA UM PROPÓSITO ESPECÍFICO. Seja GNU - General Public License para mais detalhes. \n\nVocê deve ter recebido uma cópia do GNU - General Public License junto com este programa; Caso não o tenha recebido, escreva para a Fundação de Software Livre, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo " +"sob os termos do GNU - General Public License como publicado pela Fundação " +"de Software Livre; tanto a versão 2 da Licensa quanto (na sua opinião) " +"qualquer versão posterior a esta.\n" +"\n" +"Este programa é distribuído esperando que seja útiil, \n" +"mas SEM NENHUMA GARANTIA; sem até mesmo a garantia implicada de " +"MERCANTIBILIDADE ou SERVIÇO PARA UM PROPÓSITO ESPECÍFICO. Seja GNU - " +"General Public License para mais detalhes. \n" +"\n" +"Você deve ter recebido uma cópia do GNU - General Public License junto com " +"este programa; Caso não o tenha recebido, escreva para a Fundação de " +"Software Livre, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "A equipe de Tradução do Fedora " -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Você quer fechar a sessão?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Não me pergunte novamente" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Esperando pelo display %d..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Tipo de gráfico desconhecido para convidados %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Falha ao conectar com o ssh." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Não foi possível conectar o canal, SSH somente suportado." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "A conexão com o canal não é suportada." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Conectando ao servidor de gráfico" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Domínio de convidado precisa ser fechado" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Conectado ao servidor de gráfico" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Incapaz de conectar ao servidor de gráfico %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Incapaz de autenticar com o servidor de desktop remoto em %s: %s Tentar conexão novamente?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Incapaz de autenticar com o servidor remoto: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Erro de redirecionamento do USB:%s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Zoom nível deve ser dentro de %d-%d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Exibir %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Inválido kiosk-quit argumento: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Nível de zoom da janela, em porcentagem" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Abra no modo tela cheia (ajusta a resolução do convidado para caber no cliente)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Abra no modo tela cheia (ajusta a resolução do convidado para caber no " +"cliente)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Personalize teclas de atalho " -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Ativar kiosk modo" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Sair em determinada condição em kiosk modo " -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Exibir informações de verbose" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Exibir informações de depuração" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Autenticação requerida" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "rótulo" @@ -343,6 +422,14 @@ msgid "Username:" msgstr "Nome de usuário:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "Exibir senha" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -375,204 +462,242 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Execute '%s --help' para ver uma lista completa das opções de linha de comando disponíveis" +msgstr "" +"Execute '%s --help' para ver uma lista completa das opções de linha de " +"comando disponíveis" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nUso: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "Senha inválida" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Selecionar os dispositivos do USB para redirecionamento" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Autenticação não suportada tipo %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "Nenhuma máquina virtual foi encontrada" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Screenshot" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "Desconhecido" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Desconectar" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Seleção de dispositivo de USB" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Enviar combinação de teclas" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Deixar tela cheia" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Pressione %s para liberar o ponteiro)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "Pelo menos %s versão %s é necessária para configurar esta conexão" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Esperando pelo domínio do convidado para reiniciar" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Não é possível determinar o tipo de gráfico para o convidado %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Não foi possível determinar o endereço do gráfico para o convidado %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Não foi possível determinar o host para os convidados %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Aguardando libvirt para iniciar" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Encontrando o domínio do convidado" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Esperando pelo domínio do convidado a ser criado" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Não foi possível encontrar o domínio do convidado %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Verificando o status do domínio do convidado" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Esperando pelo domínio do convidado para iniciar" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Esperando pelo domínio do convidado para iniciar servidor" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Incapaz de conectar ao libvirt com o URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[nenhum]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "falha na autenticação." + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Arquivo" @@ -585,30 +710,78 @@ msgid "Smartcard removal" msgstr "Remoção do Smartcard" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Visualizar" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Tela cheia" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Zoom" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Displays" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Liberar o cursor" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Chave de Envio" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Ajuda" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "Nome:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "Escolha uma máquina virtual" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "Nome" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "Máquinas virtuais disponíveis" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ro.po b/po/ro.po index 49dd35f..11036d6 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Romanian (http://www.transifex.com/projects/p/virt-viewer/language/ro/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Romanian\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2);\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ru.po b/po/ru.po index 75f02db..90bd92d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,28 +1,33 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Alexander Savchenko, 2014 # Automatically generated, 2010 # triplepointfive , 2012 # Yulia , 2010, 2012 # Yulia , 2013 +# Ilyas B Arinov , 2015. #zanata +# yuliya , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/virt-viewer/language/ru/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-06-07 07:46-0400\n" +"Last-Translator: Ilyas B Arinov \n" +"Language-Team: Russian (http://www.transifex.com/projects/p/virt-viewer/" +"language/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Удаленный просмотр" @@ -76,103 +81,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer, версия %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Показать версию" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Изменить заголовок окна" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Открыть соединение с помощью контроллера Spice" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Клиент удаленного просмотра" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nВыполните «%s --help» для просмотра полного списка параметров\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Выполните «%s --help» для просмотра полного списка параметров\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "Ошибка. Лишние аргументы при использовании контроллера Spice\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Ошибка. Обработка нескольких URI не допускается.\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Не удалось установить соединение" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Дисплей отключен контроллером" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Ошибка подключения контроллера: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Свойства подключения" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "_Сменить CD" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "не удалось обработать oVirt uri" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "Виртуальная машина oVirt %s не работает" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "Отсутствует дисплей у ВМ oVirt %s" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Не удалось создать сеанс Spice" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "Неизвестный тип дисплея виртуальной машины oVirt %s: %d" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Инициализация сеанса Spice..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Недопустимый файл %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Не удалось определить тип подключения в URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Не удалось создать сеанс этого типа: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Свойства подключения" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Например, spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "О Glade" @@ -182,10 +225,14 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"(C) 2007-2012 Daniel P. Berrange\n" +"(C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Клиент удаленного рабочего стола построен на основе GTK-VNC, SPICE-GTK и libvirt" +msgstr "" +"Клиент удаленного рабочего стола построен на основе GTK-VNC, SPICE-GTK и " +"libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -206,133 +253,171 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Эта программа относится к категории свободного программного обеспечения;\nеё можно распространять и изменять в соответствии с условиями \nлицензии GNU General Public License 2 или любой более поздней версии, \nопубликованной фондом свободного программного обеспечения. \n\nПрограмма распространяется в надежде, что она может быть полезной, \nно БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ,\nВ ТОМ ЧИСЛЕ БЕЗ ГАРАНТИЙ КОММЕРЧЕСКОЙ ЦЕННОСТИ И \nПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. \nПодробную информацию можно найти в тексте лицензии GNU. \n\nКопия лицензии GNU предоставляется вместе с этой программой.\nАдрес фонда: Free Software Foundation, \nInc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"Эта программа относится к категории свободного программного обеспечения;\n" +"её можно распространять и изменять в соответствии с условиями \n" +"лицензии GNU General Public License 2 или любой более поздней версии, \n" +"опубликованной фондом свободного программного обеспечения. \n" +"\n" +"Программа распространяется в надежде, что она может быть полезной, \n" +"но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ,\n" +"В ТОМ ЧИСЛЕ БЕЗ ГАРАНТИЙ КОММЕРЧЕСКОЙ ЦЕННОСТИ И \n" +"ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. \n" +"Подробную информацию можно найти в тексте лицензии GNU. \n" +"\n" +"Копия лицензии GNU предоставляется вместе с этой программой.\n" +"Адрес фонда: Free Software Foundation, \n" +"Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Команда локализации Fedora" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Закрыть сеанс?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Больше не спрашивать" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Ожидание просмотра %d..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Неизвестный тип графической подсистемы для гостя %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Ошибка соединения ssh." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Не удалось подключиться к каналу. Поддерживается только SSH." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Подключение к каналу не поддерживается." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "Дисплей может быть подключён только через libvirt с --attach" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Подключение к графическому серверу" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Гостевой домен завершил работу" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Установлено соединение с графическим сервером" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Не удалось установить соединение с сервером %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Не удалось пройти аутентификацию на удаленном сервере: %s: %s\nПовторить попытку подключения?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Не удалось пройти аутентификацию на удаленном сервере: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Ошибка перенаправления USB: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 +msgstr "Уровень увеличения должен быть между %d-%d\n" + +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Экран %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 +msgstr "недопустимый аргумент kiosk-quit: %s" + +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Масштаб окна в процентах" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" - -#: ../src/virt-viewer-app.c:2314 +"Открыть в полноэкранном режиме (регулирует разрешение гостя для соответствия " +"клиенту)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Настроить комбинации клавиш" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 +msgstr "Включить режим киоска" + +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 +msgstr "Выйти по заданному условию в режиме киоска" + +#: ../src/virt-viewer-app.c:2569 msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 +msgstr "" + +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Подробный вывод" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Показать сообщения диагностики" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" +"Требуется аутентификация для соединения %s с:\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "Требуется аутентификация для соединения %s:\n" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Требуется проверка подлинности" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "метка" @@ -344,6 +429,14 @@ msgid "Username:" msgstr "Пользователь:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "Показать пароль" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -380,200 +473,236 @@ #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "Графическая консоль виртуальной машины" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nФормат: %s [ПАРАМЕТРЫ] ДОМЕН|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "неверный пароль" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "Неверный пароль" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Выбрать устройства USB для перенаправления" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Неподдерживаемый тип аутентификации %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "Виртуальная машина не найдена" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Снимок экрана" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "Неизвестно" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Отключиться" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Выбор устройства USB" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Отправить комбинацию клавиш" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Выйти из полноэкранного режима" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(нажмите %s для освобождения курсора)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 +msgstr "Чтобы установить соединение требуется по крайней мере %s версии %s" + +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Ожидание перезапуска гостевого домена" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Не удалось определить тип графической подсистемы для гостя %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Не удалось определить адрес графического интерфейса для гостя %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Не удалось определить хост для гостя %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "Гость '%s' недосягаем" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "Виртуальная машина %s не запущена" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Ожидание запуска libvirt" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Поиск гостевого домена" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Ожидание создания гостевого домена" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Гостевой домен %s не найден" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Проверка статуса гостевого домена" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Ожидание запуска гостевого домена" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Ожидание запуска сервера гостевого домена" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Не удалось подключиться к libvirt на URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "Невозможно подключиться к libvirt с URI: %s." + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[нет]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "Сбой аутентификации." + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Файл" @@ -586,30 +715,78 @@ msgid "Smartcard removal" msgstr "Удаление смарт-карты" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Просмотр" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Во весь экран" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Масштаб" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Экраны" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Освободить курсор" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "О_тправить клавишу" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Справка" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "_Детали гостя" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "Детали гостя" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "Имя:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "Выберите виртуальную машину" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "Имя" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "Доступные виртуальные машины" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po deleted file mode 100644 index 783fae3..0000000 --- a/po/ru_RU.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/fedora/language/ru_RU/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/si.po b/po/si.po index 5226427..b06b4f0 100644 --- a/po/si.po +++ b/po/si.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Sinhala (http://www.transifex.com/projects/p/virt-viewer/language/si/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Sinhala\n" +"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: si\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/sk.po b/po/sk.po index 0f3c1e1..7f63fbf 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Michal Hriň , 2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Slovak (http://www.transifex.com/projects/p/virt-viewer/language/sk/)\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/virt-viewer/" +"language/sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -72,103 +74,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Zobraziť informácie o verzii" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Zlyhala inicializácia spojenia" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Spojenie radiču zlyhalo: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Detaily spojenia" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Nie je možné vytvoriť Spice sedenie" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Nastavuje sa Spice sedenie..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Nie je možné určiť typ spojenia z URI" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Detaily spojenia" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -208,127 +246,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh spojenie zlyhalo." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Nie je možne pripojenie do kanálu, podporované je iba SSH." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Pripájanie na grafický server" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Nie je možné spojenie ku grafickému serveru %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Chyba USB presmerovania: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -338,6 +394,14 @@ #: ../src/virt-viewer-auth.xml.h:4 msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" msgstr "" #: ../src/virt-viewer-main.c:38 @@ -378,198 +442,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Odpojiť" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Výber USB zariadenia" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Opustiť režim celej obrazovky" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Stlačte %s pre uvoľnenie ukazovateľa)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Súbor" @@ -582,30 +682,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Zobraziť" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Celá obrazovka" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Uvoľniť kurzor" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Pomoc" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/sl.po b/po/sl.po index b8252a6..3d8b082 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Slovenian (http://www.transifex.com/projects/p/virt-viewer/language/sl/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Slovenian\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/sq.po b/po/sq.po index 0fa124a..bf594c2 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Albanian (http://www.transifex.com/projects/p/virt-viewer/language/sq/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Albanian\n" +"Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sq\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/sr.po b/po/sr.po index 8225b62..9a2ad0b 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Serbian (http://www.transifex.com/projects/p/virt-viewer/language/sr/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Serbian\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/sr@latin.po b/po/sr@latin.po index 01ce1d3..0d82c8d 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/virt-viewer/language/sr@latin/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Serbian (LATIN)\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr@latin\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +73,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +245,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +395,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +441,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +681,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/sv.po b/po/sv.po index bae0877..09c16ad 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,26 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # denka , 2014 -# Göran Uddeborg , 2013 +# Göran Uddeborg , 2013-2014 # Klap Hest , 2013 +# Göran Uddeborg , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Swedish (http://www.transifex.com/projects/p/virt-viewer/language/sv/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-08-31 01:47-0400\n" +"Last-Translator: Göran Uddeborg \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/virt-viewer/" +"language/sv/)\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Fjärrvisare" @@ -74,103 +77,142 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer version %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Visa versionsinformation" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Ange fönstertitel" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Öppna anslutning med Spice-styrning av kommunikationen" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Fjärrvisarklient" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nKör ”%s --help” för att se hela listan över tillgängliga kommandoradsflaggor\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Kör ”%s --help” för att se hela listan över tillgängliga " +"kommandoradsflaggor\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "Fel: extra argument angivna vid användning av Spice-styrning\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Fel: kan inte hantera flera URI:er\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Misslyckades att initiera anslutningen" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Visningen avaktiverad av styrenhet" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Styranslutning misslyckades: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Anslutningsdetaljer" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "_Byt CD" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "kunde inte analysera ovirt-uri" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "oVirt-VM %s kör inte" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "oVirt-VM %s har ingen display" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Kunde inte skapa en Spice-session" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "oVirt-VM %s har en okänd display-typ: %d" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Sätter upp en Spice-session …" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Ogiltig fil %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Kan inte avgöra anslutningstypen från URI:n" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Kunde inte öppna en oVirt-session" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Kunde inte skapa en session för denna typ: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Anslutningsdetaljer" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Till exempel, spice://apa.exempel.se:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Om Glade" @@ -180,6 +222,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright © 2007-2012 Daniel P. Berrange\n" +"Copyright © 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -204,133 +248,169 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Detta program är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version.\n\nDetta program distribueras i hopp om att det ska vara användbart, men UTAN NÅGON GARANTI, även utan underförstådd garanti vid KÖP eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information.\n\nDu bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"Detta program är fri programvara. Du kan distribuera det och/eller " +"modifiera det under villkoren i GNU General Public License, publicerad av " +"Free Software Foundation, antingen version 2 eller (om du så vill) någon " +"senare version.\n" +"\n" +"Detta program distribueras i hopp om att det ska vara användbart, men UTAN " +"NÅGON GARANTI, även utan underförstådd garanti vid KÖP eller LÄMPLIGHET FÖR " +"NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare " +"information.\n" +"\n" +"Du bör ha fått en kopia av GNU General Public License tillsammans med detta " +"program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple " +"Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedoras översättningsgrupp" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Vill du stänga sessionen?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Fråga mig inte igen" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Väntar på display %d …" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Okänd grafiktyp för gästen %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Anslutning till ssh misslyckades." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Kan inte ansluta till kanalen, endast SSH stödjs." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Anslutning till kanalen stödjs inte." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "Kan bara ansluta till displayen via libvirt med --attach" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Anslutning till grafikserver" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Gästdomänen är avstängd" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Ansluten till grafikserver" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Kan inte ansluta till grafikservern %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Kan inte autenticera med fjärskrivbordsservern på %s: %s\nFörsök ansluta igen?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Kan inte autenticera med fjärskrivbordsserver: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB-omdirigeringsfel: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Zoom-nivån måste vara inom %d-%d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Display %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Ogiltigt helskärmsargument: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Zoom-nivå för fönstret, i procent" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Öppna i fullskärmsläge (ställ upplösningen på gästen till att passa klienten)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Öppna i fullskärmsläge (ställ upplösningen på gästen till att passa klienten)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Anpassa snabbtangenter" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Aktivera kioskläge" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Avsluta på angivet villkor i kioskläge" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Visa utförlig information" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Visa felsökningsinformation" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" +"Autenticering krävs för %s-anslutningen till:\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "Autenticering krävs för %s-anslutningen:\n" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Autenticering krävs" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "etikett" @@ -342,6 +422,14 @@ msgid "Username:" msgstr "Användarnamn:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "Visa lösenord" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -374,204 +462,241 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Kör ”%s --help” för att se hela listan av tillgängliga kommandoradsflaggor" +msgstr "" +"Kör ”%s --help” för att se hela listan av tillgängliga kommandoradsflaggor" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "Grafisk konsol för virtuella maskiner" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nAnvändning: %s [FLAGGOR] DOMÄNNAMN|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "Ogiltligt lösenord" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "Felaktigt lösenord" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Välj USB-enheter att omdirigera" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Autenticeringstyp %d som inte stödjs" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "Ingen virtuell maskin funnen" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Baksteg" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Skärmbild" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "Okänd" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Koppla ifrån" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Val av USB-enhet" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Skicka tangentbordskombination" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Lämna helskärm" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Tryck %s för att släppa markören)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "Åtminstone %s version %s behövs för att skapa denna anslutning" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Vänta på att gästdomänen startas om" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Kan inte avgöra grafiktypen för gästen %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Kan inte avgöra grafikadressen för gästen %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Kan inte avgöra värden för gästen %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "Gästen ”%s” är inte nåbar" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "Den virtuella maskinen %s kör inte" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Väntar på att libvirt skall starta" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Letar reda på gästdomänen" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Väntar på att gästdomänen skall skapas" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Kan inte hitta gästdomänen %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Kontrollerar gästdomänens status" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Väntar på att gästdomänen skall starta" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Väntar på att gästdomänen skall starta servern" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Kan inte ansluta till libvirt med URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "Kan inte ansluta till libvirt med URI: %s." + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[ingen]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "Autenticeringen misslyckades." + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Arkiv" @@ -584,30 +709,78 @@ msgid "Smartcard removal" msgstr "Uttag av smartkort" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "_Visa" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Helskärm" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Zoom" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Displayer" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Släpp markören" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Skicka tangent" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Hjälp" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "_Gästdetaljer" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "Gästdetaljer" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "Namn:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "Välj en virtuell maskin" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "Namn" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "Tillgängliga virtuella maskiner" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ta.po b/po/ta.po index a28ea4a..7c647e2 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Felix I , 2012 # I. Felix , 2010 @@ -10,19 +10,21 @@ # shkumar , 2012-2013 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Tamil (http://www.transifex.com/projects/p/virt-viewer/language/ta/)\n" +"Language-Team: Tamil (http://www.transifex.com/projects/p/virt-viewer/" +"language/ta/)\n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "தொலைநிலை காட்டி" @@ -76,103 +78,142 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer பதிப்பு %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "காட்சி பதிப்பு தகவல்" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "சாளர தலைப்பை அமைக்கவும்" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "ஸ்பைஸ் கட்டுப்படுத்தி தொடர்பை பயன்படுத்தி இணைப்பை திறக்கவும்" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "தொலைநிலைக் காட்சிக் கிளை" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nகிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' கட்டளையை இயக்கவும்\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"கிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' கட்டளையை " +"இயக்கவும்\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "பிழை: ஸ்பைஸ் கன்ட்ரோலரைப் பயன்படுத்தும் போது கூடுதல் அளவுருக்கள் கொடுக்கப்பட்டன\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "பிழை: பல URIகளைக் கையாள முடியாது\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "இணைப்பை துவக்க முடியவில்லை" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "கட்டுப்படுத்தியால் காட்சி செயல்நீக்கப்பட்டது" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "கட்டுப்படுத்தி இணைப்பு தோல்வியுற்றது: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "இணைப்பு விவரங்கள்" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "ஒரு ஸ்பைஸ் அமர்வை உருவாக்க முடியவில்லை" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "ஸ்பைஸ் அமர்வை அமைக்கிறது..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "செல்லுபடியாகாத கோப்பு %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI-இலிருந்து இணைப்பு வகையை வரையறுக்க முடியாது" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt அமர்வைத் திறக்க முடியவில்லை" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "இந்த வகைக்கு ஒரு அமர்வை உருவாக்க முடியாது: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "இணைப்பு விவரங்கள்" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "எடுத்துக்காட்டுக்கு spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade பற்றி" @@ -182,6 +223,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -206,133 +249,168 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora மொழிபெயர்ப்பு குழு" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "அமர்வை மூட வேண்டுமா?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "மீண்டும் என்னிடம் கேட்க வேண்டாம்" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "காட்சி %d-க்கு காத்திருக்கிறது..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "விருந்தினர் %sக்கான தெரியாத வரைகலை வகை" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh-உடன் இணைக்க முடியவில்லை." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "சேனலுடன் இணைக்க வேண்டாம், SSH மட்டும் துணைபுரிகிறது." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "சேனலுடன் இணைப்பு துணைபுரியவில்லை." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "வரைகலை சேவையகத்துடன் இணைக்கிறது" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "விருந்தினர் டொமைன் நிறுத்தப்பட்டது" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "வரைகலை சேவையகத்துடன் இணைக்கப்பட்டது" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "வரைகலை சேவையகம் %s-க்கு இணைக்க முடியவில்லை" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "தொலை பணிமேடை சேவையகம் %s-இலில் அங்கீகரிக்க முடியவில்லை: %s\nஇணைப்பை மீண்டும் முயற்சிக்கவும்?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "தொலை பணிமேடை சேவையகத்துடன் அங்கீகரிக்க முடியவில்லை: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB மறுதிசையிடல் பிழை: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" -msgstr "பெரிதாக்கும் நிலை %d-%d க்குள் இருக்க வேண்டும்\n\n" - -#: ../src/virt-viewer-app.c:2126 +msgstr "" +"பெரிதாக்கும் நிலை %d-%d க்குள் இருக்க வேண்டும்\n" +"\n" + +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d ஐக் காண்பி" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "செல்லுபடியாகாத kiosk-quit மதிப்புரு: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "சாளரத்தின் அளவிடும் நிலை, சதவீதத்தில்" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "முழுத்திரைப் பயன்முறையில் திறக்கவும் (விருந்தினர் தெளிவுத்திறனை கிளையன்ட்டுக்குப் பொருந்துமாறு சரிசெய்யவும்)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"முழுத்திரைப் பயன்முறையில் திறக்கவும் (விருந்தினர் தெளிவுத்திறனை கிளையன்ட்டுக்குப் " +"பொருந்துமாறு சரிசெய்யவும்)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "குறுக்குவிசைகளை தனிப்பயனாக்கவும்" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "kiosk பயன்முறையை " -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "kiosk பயன்முறையில் கொடுக்கப்பட்டுள்ள நிபந்தனையில் வெளியே" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "காட்சி வெர்போஸ் தகவல்" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "பிழைத்திருத்த தகவலை காட்டவும்" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "அங்கீகாரம் தேவை" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "லேபிள்" @@ -344,6 +422,14 @@ msgid "Username:" msgstr "பயனர்பெயர்:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -376,204 +462,241 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "கிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' கட்டளையை இயக்கவும்" +msgstr "" +"கிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' கட்டளையை இயக்கவும்" #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "மெய்நிகர் கணினி வரைவியல் " + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nபயன்பாடு: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "செல்லுபடியாகாத கடவுச்சொல்" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "மறுதிசையிட USB சாதனங்களை தேர்ந்தெடுக்கவும்" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "துணைபுரியாத அங்கீகார வகை %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "திரைப்பிடிப்பு" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "துண்டி" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB சாதன தேர்வு" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "விசைச் சேர்க்கையை அனுப்பு" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "முழுத்திரையை விட்டுவிலகு" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(சுட்டியை விடுவிக்க %s ஐ அழுத்தவும்)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "இந்த இணைப்பை அமைக்க குறைந்தது %s பதிப்பு %s தேவை" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "மறுதுவக்க விருந்தினர் டொமைனுக்காக காத்திருக்கிறது" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "விருந்தினர் %s-க்கு வரைகலை வகையை வரையறுக்க முடியாது" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "விருந்தினர் %s-க்கு வரைகலை முகவரியை வரையறுக்க முடியாது" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "விருந்தினர் %s-க்கு புரவலனை வரையறுக்க முடியாது" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt தொடங்கக் காத்திருக்கிறது" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "விருந்தினர் டொமைனை தேடுகிறது" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "விருந்தினர் டொமைன் உருவாக்க காத்திருக்கிறது" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "விருந்தினர் டொமைன் %sஐ தேட முடியவில்லை" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "விருந்தினர் நிலையை சரிபார்க்கிறது" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "துவக்க விருந்தினர் டொமைனுக்காக காத்திருக்கிறது" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "சேவையகத்தை துவக்க விருந்தினர் டொமைனுக்காக காத்திருக்கிறது" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "libvirt ஐ URI %s உடன் இணைக்க முடியவில்லை" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[ஒன்றுமில்லாத]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "கோப்பு (_F)" @@ -586,30 +709,78 @@ msgid "Smartcard removal" msgstr "ஸ்மார்ட் கார்டு நீக்கல்" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "பார்வை (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "முழுத்திரை" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "அளவிடு (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "காட்சிகள்" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "கர்சரை விடு" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "விசையை அனுப்பு (_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "உதவி (_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/ta_IN.po b/po/ta_IN.po deleted file mode 100644 index acff11e..0000000 --- a/po/ta_IN.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/fedora/language/ta_IN/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ta_IN\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/te.po b/po/te.po index 54e9cc5..04ea8ee 100644 --- a/po/te.po +++ b/po/te.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Krishnababu Krothapalli , 2010,2012 # Krishnababu Krothapalli , 2010,2012,2014 @@ -9,19 +9,21 @@ # Sudheesh Singanamalla , 2013 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Telugu (http://www.transifex.com/projects/p/virt-viewer/language/te/)\n" +"Language-Team: Telugu (http://www.transifex.com/projects/p/virt-viewer/" +"language/te/)\n" +"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "దూరస్థ దర్శని" @@ -75,103 +77,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "రిమోట్-వ్యూయర్ వర్షన్ %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "వర్షన్ సమాచారం ప్రదర్శించు" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "విండోలో శీర్షిక సెట్ చెయ్యండి" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "స్పైస్ కంట్రోలర్ కమ్యునికేషన్ వుపయోగించి అనుసంధానం తెరువుము" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nఅందుబాటులోని కమాండ్ లైన్ ఐచ్చికాల జాబితా కొరకు '%s --help' నడుపుము\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"అందుబాటులోని కమాండ్ లైన్ ఐచ్చికాల జాబితా కొరకు '%s --help' నడుపుము\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "దోషం: స్పైస్ నియంత్రణి వుపయోగించునప్పుడు అదనపు ఆర్గుమెంట్లు యీయబడెను\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "దోషం: బహుళ URIలను సంభాలించలేదు\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "అనుసంధానం సిద్దపరచుటకు విఫలమైంది" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "నియంత్రికచే ప్రదర్శన అచేతనమైంది" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "నియంత్రిక అనుసంధానం విఫలమైంది: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "అనుసంధానం వివరాలు" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "స్పైస్ సెషన్ సృష్టించలేకపోయింది" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "స్పైస్ సెషన్ అమర్చుచున్నది..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "చెల్లని ఫైల్ %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "URI నుండి అనుసంధానం రకంను నిర్థారించలేము" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "oVirt సెషన్ సృష్టించలేకపోయిం" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "ఈ రకము కొరకు సెషన్ సృష్టించలేక పోయింది: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "అనుసంధానం వివరాలు" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "గ్లేడ్ గురించి" @@ -205,133 +245,164 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "ఈ ప్రోగ్రామ్ ఉచిత సాఫ్టువేర్; ఉచిత సాఫ్టువేర్ సంస్థ తరుపున ప్రచురితమైన\nGNU జనరల్ పబ్లిక్ లైసెన్సు కు లోబడి దీనిని మీరు పునఃపంపిణి మరియు/లేదా\nసవరణ చేయవచ్చు; మీరు అనుసరించవలిసినది లైసెన్సు యొక్క వర్షన్ 2, లేదా\n(మీ ఐచ్చికం వద్ద) దాని తరువాతి వర్షన్ కాని.\n\nపవర్ నిర్వాహకి అది ఉపయోగపడుతుందనే నమ్మకం తో పంపిణీ చేయబడింది,\nఅయితే ఏ హామి లేదు; వ్యాపారసంబంధితంగా కాని లేదా ప్రతిపాదిత ప్రయోజనం కొరకు\nకాని హామీ లేదు. అధికవివరములకొరకు GNU జనరల్ పబ్లిక్ లైసెన్సు ను\nచూడండి.\n\nఈ ప్రోగ్రామ్ తో మీరు GNU జనరల్ పబ్లిక్ లైసెన్సు నకలు ను పొంది ఉంటారు;\nపొందకపోతే, Free Software Foundation, Inc., Temple Place,\nSuite 330, Boston, MA 02111-1307 USAకు వ్రాయండి.\n" +msgstr "" +"ఈ ప్రోగ్రామ్ ఉచిత సాఫ్టువేర్; ఉచిత సాఫ్టువేర్ సంస్థ తరుపున ప్రచురితమైన\n" +"GNU జనరల్ పబ్లిక్ లైసెన్సు కు లోబడి దీనిని మీరు పునఃపంపిణి మరియు/లేదా\n" +"సవరణ చేయవచ్చు; మీరు అనుసరించవలిసినది లైసెన్సు యొక్క వర్షన్ 2, లేదా\n" +"(మీ ఐచ్చికం వద్ద) దాని తరువాతి వర్షన్ కాని.\n" +"\n" +"పవర్ నిర్వాహకి అది ఉపయోగపడుతుందనే నమ్మకం తో పంపిణీ చేయబడింది,\n" +"అయితే ఏ హామి లేదు; వ్యాపారసంబంధితంగా కాని లేదా ప్రతిపాదిత ప్రయోజనం కొరకు\n" +"కాని హామీ లేదు. అధికవివరములకొరకు GNU జనరల్ పబ్లిక్ లైసెన్సు ను\n" +"చూడండి.\n" +"\n" +"ఈ ప్రోగ్రామ్ తో మీరు GNU జనరల్ పబ్లిక్ లైసెన్సు నకలు ను పొంది ఉంటారు;\n" +"పొందకపోతే, Free Software Foundation, Inc., Temple Place,\n" +"Suite 330, Boston, MA 02111-1307 USAకు వ్రాయండి.\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora అనువాద సమూహం" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "సెషన్ మూసివేయాలనుకుంటున్నారా ?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "నన్ను మళ్ళీ అడగవద్దు" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "ప్రదర్శన %d కొరకు వేచివుంది..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "అతిథి %s కొరకు తెలియని గ్రాఫిక్ రకం" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "ssh క్షేత్రముకు అనుసంధానించు." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "చానల్‌కు అనుసంధానం కాలేదు, SSH కు మాత్రమే తోడ్పాటు నిస్తోంది." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "చానల్ అనుసంధానంకు తోడ్పాటులేదు." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "గ్రాఫిక్ సేవికకు అనుసంధానమౌతోంది" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "అతిథి డొమైన్ మూసివేసింది" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "గ్రాఫిక్ సేవికకు అనుసంధానమైంది" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "గ్రాఫిక్ సేవిక %sకు అనుసంధానం కాలేక పోయింది" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "%s వద్ద రిమోట్ డెస్కుటాప్ సేవికతో ధృవీకరించలేక పోయింది: %s\nఅనుసంధానముకు మరలా ప్రయత్నించాలా?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "రిమోట్ డెస్కుటాప్ సేవికతో ధృవీకరించలేక పోయింది: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB రీడైరెక్షన్ దోషం: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "జూమ్ స్థాయి తప్పకుండా %d-%d మధ్యన వుండాలి\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "%d ప్రదర్శించు" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "చెల్లని kiosk-quit ఆర్గుమెంట్: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "విండో యొక్క జూమ్ స్థాయి, శాతంలో" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "పూర్తి తెర రీతినందు తెరువుము (క్లైంట్‌కు అమరుటకు అతిథి రిజొల్యూషన్ సర్దుబాటుచేయి)" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "అనుకూలీకరించి హాట్కీస్" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "kiosk రీతిని చేతనం చేయి" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "ఇచ్చిన నియమంపై kiosk రీతినందు నిష్క్రమించు" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "వెర్బోస్ సమాచారమును ప్రదర్శించుము" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "డీబగ్గింగ్ సమాచారమును ప్రదర్శించుము" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "ధృవీకరణము అవసరమైంది" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "లేబుల్" @@ -343,6 +414,14 @@ msgid "Username:" msgstr "వినియోగదారినామము:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -381,198 +460,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nవినియోగము: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "చెల్లని సంకేతపదం" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "రీడైరెక్షన్ కొరకు USB పరికరాలను యెంపికచేయి" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "మద్దతీయని దృవీకరణ రకము %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "స్క్రీన్‌షాట్" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "అననుసంధానించు" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB పరికర యెంపిక" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "కీ జోడీను పంపు" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "నిండుతెర విడు" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(సూచీను విడుదల చేయుటకు %s వత్తండి)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "కనీసం% s వెర్షన్% s వద్ద ఈ కనెక్షన్ని సెటప్ చెయ్యడానికి అవసరం" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "అతిథి డొమైన్ పునఃప్రారంభం కొరకు వేచివుంది" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "అతిథి %s కొరకు గ్రాఫిక్ రకంను నిర్థారించలేక పోయింది" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "అతిథి %s కొరకు గ్రాఫిక్ చిరునామా నిర్ధారించలేదు" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "అతిథి %s కొరకు అతిథేయను నిర్ధారించలేదు" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "libvirt ప్రారంభించడానికి కోసం వేచి ఉన్నారు" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "అతిథి డొమైన్‌ కనుగొనుచున్నది" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "అతిథి డొమైన్ సృష్టించబడుటకు వేచివుంది" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "అతిథి డొమైన్‌ %sను కనుగొనలేక పోయింది" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "అతిథి డొమైన్‌ స్థితి పరిశీలిస్తోంది" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "అతిథి డొమైన్ ప్రారంభమగుటకు వేచివుంది" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "అతిథి డొమైన్ సేవికను ప్రారంభించుట కొరకు వేచివుంది" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "URI %sతో libvirtకు అనుసంధానం కాలేదు" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[ఏదీకాదు]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "ఫైలు (_F)" @@ -585,30 +700,78 @@ msgid "Smartcard removal" msgstr "స్మార్టుకార్డ్ తీసివేత" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "దర్శించు (_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "నిండు తెర" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "జూమ్ (_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "ప్రదర్శనలు" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "సూచీ విడుదలచేయి" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "పంపు కీ(_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "సహాయము(_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/tg.po b/po/tg.po index cf520e4..0be08b4 100644 --- a/po/tg.po +++ b/po/tg.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Tajik (http://www.transifex.com/projects/p/virt-viewer/language/tg/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Tajik\n" +"Language: tg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tg\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/th.po b/po/th.po index 5840713..7b9f23c 100644 --- a/po/th.po +++ b/po/th.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Thai (http://www.transifex.com/projects/p/virt-viewer/language/th/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Thai\n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: th\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/tl.po b/po/tl.po deleted file mode 100644 index 03d6905..0000000 --- a/po/tl.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Tagalog (http://www.transifex.com/projects/p/virt-viewer/language/tl/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: tl\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/tr.po b/po/tr.po index a7ee9dd..ebf67d7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,24 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Necdet Yücel , 2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Turkish (http://www.transifex.com/projects/p/virt-viewer/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/virt-viewer/" +"language/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -72,103 +74,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Sürüm bilgisini göster" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Glade Hakkında" @@ -208,127 +246,145 @@ msgid "The Fedora Translation Team" msgstr "Fedora Çeviri Ekibi" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Ssh bağlantısı başarısız oldu." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Grafik sunucuya bağlanıyor" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Grafik sunucuya bağlandı" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB yönlendirme hatası: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Hata ayıklama bilgisini görüntüle" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Kimlik Doğrulama gerekli" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "etiket" @@ -340,6 +396,14 @@ msgid "Username:" msgstr "Kullanıcı Adı:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -378,198 +442,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nKullanım: %s [SEÇENEKLER] ALAN-ADI|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Ekran Görüntüsü" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Bağlantıyı Kes" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB aygıt seçimi" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Tam ekrandan ayrıl" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Dosya" @@ -582,30 +682,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Tam Ekran" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Yardım" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/tw.po b/po/tw.po new file mode 100644 index 0000000..5718cbe --- /dev/null +++ b/po/tw.po @@ -0,0 +1,757 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Twi\n" +"Language: tw\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/uk.po b/po/uk.po index b2e32e9..c2f6dbe 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,24 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Yuri Chornoivan , 2011-2014 +# Yuri Chornoivan , 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Ukrainian (http://www.transifex.com/projects/p/virt-viewer/language/uk/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-12-07 12:22-0500\n" +"Last-Translator: Yuri Chornoivan \n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/virt-viewer/" +"language/uk/)\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: uk\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "Віддалений переглядач" @@ -72,103 +76,143 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer версії %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "remote-viewer версії %s" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "Показати інформацію щодо версії" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "Встановити вказаний заголовок вікна" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "Встановити з’єднання за допомогою обміну даними з контролером Spice" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "Клієнтська програма для перегляду віддалених систем" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\nЩоб переглянути повний список можливих параметрів командного рядка, віддайте команду «%s --help»\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"Щоб переглянути повний список можливих параметрів командного рядка, віддайте " +"команду «%s --help»\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" -msgstr "Помилка: під час використання контролера Spice передано зайві параметри\n" - -#: ../src/remote-viewer-main.c:153 +msgstr "" +"Помилка: під час використання контролера Spice передано зайві параметри\n" + +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "Помилка: обробка декількох адрес одночасно неможлива\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "Не вдалося започаткувати з’єднання" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "Екран вимкнено контролером" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "Помилка з’єднання з контролером: %s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "Параметри з’єднання" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "За_мінити CD" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "не вдалося обробити адресу ovirt" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "Розпізнавання було скасовано" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "ВМ oVirt %s не запущено" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "ВМ oVirt %s не має дисплея" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "ВМ oVirt %s не містить даних щодо основної системи" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "Не вдалося створити сеанс Spice" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "Дисплей ВМ oVirt %s належить до невідомого типу: %d" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "Налаштування сеансу Spice…" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "Некоректний файл %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "Не вибрано з’єднання" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "Некоректний файл %s: " + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "Не вдалося визначити тип з’єднання за адресою" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "Не вдалося відкрити сеанс oVirt" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "Не вдалося створити сеанс цього типу: %s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "Не вдалося відкрити сеанс oVirt: " + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "Параметри з’єднання" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "Адреса з’єднання" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "Приклад: spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "Нещодавні з’єднання" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "Скасувати" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "З'єднатися" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "Про Glade" @@ -178,10 +222,14 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"© Daniel P. Berrange, 2007–2012\n" +"© Red Hat, Inc., 2007–2014" #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "Клієнтську частину віддаленого керування стільницею побудовано на основі GTK-VNC, SPICE-GTK та libvirt" +msgstr "" +"Клієнтську частину віддаленого керування стільницею побудовано на основі GTK-" +"VNC, SPICE-GTK та libvirt" #: ../src/virt-viewer-about.xml.h:5 msgid "virt-manager.org" @@ -202,133 +250,171 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "Ця програма є вільним програмним забезпеченням; ви можете поширювати її і/або змінювати її за умов дотримання GNU General Public License у тому вигляді, у якому її оприлюднено Free Software Foundation; версії 2 цієї ліцензії, або (за потреби) будь-якої пізнішої версії\n\nЦя програма поширюється у сподіванні, що вона буде корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; навіть без очевидної гарантії КОМЕРЦІЙНОЇ ЦІННОСТІ або ПРИДАТНОСТІ ДЛЯ ЯКОЇСЬ МЕТИ Докладніше про це ви можете дізнатися з \nGNU General Public License\nРазом з цією програмою ви маєте отримати копію GNU General Public License Якщо ви її не отримали, повідомте про це на адресу Free Software\nFoundation, Inc, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" +msgstr "" +"Ця програма є вільним програмним забезпеченням; ви можете поширювати її і/" +"або змінювати її за умов дотримання GNU General Public License у тому " +"вигляді, у якому її оприлюднено Free Software Foundation; версії 2 цієї " +"ліцензії, або (за потреби) будь-якої пізнішої версії\n" +"\n" +"Ця програма поширюється у сподіванні, що вона буде корисною, але БЕЗ БУДЬ-" +"ЯКИХ ГАРАНТІЙ; навіть без очевидної гарантії КОМЕРЦІЙНОЇ ЦІННОСТІ або " +"ПРИДАТНОСТІ ДЛЯ ЯКОЇСЬ МЕТИ Докладніше про це ви можете дізнатися з \n" +"GNU General Public License\n" +"Разом з цією програмою ви маєте отримати копію GNU General Public License " +"Якщо ви її не отримали, повідомте про це на адресу Free Software\n" +"Foundation, Inc, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Команда локалізації Fedora" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "Бажаєте завершити сеанс?" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "Більше не питати про це" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "Очікування на показ %d…" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "Невідомий тип графічної підсистеми для гостьової системи %s" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "Непідтримуваний тип графіки, «%s»" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "Спроба встановлення з’єднання ssh зазнала невдачі." -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "Не вдалося встановити з’єднання з каналом, підтримується лише SSH." -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "Встановлення з’єднання з каналом не підтримується." -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "Дисплей можна з’єднати лише за допомогою libvirt з параметром --attach" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "Встановлення з’єднання з графічним сервером" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "Гостьовий домен завершив роботу" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "Встановлено з’єднання з графічним сервером" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "Не вдалося встановити з’єднання з графічним сервером %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "Не вдалося пройти розпізнавання на сервері віддаленої стільниці %s: %s\nПовторити спробу встановлення з’єднання?" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" +"Не вдалося пройти розпізнавання на сервері віддаленої стільниці за адресою " +"%s: %s\n" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "Не вдалося пройти розпізнавання на сервері віддаленої стільниці: %s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "Помилка переспрямування USB: %s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "Масштаб слід вказувати у діапазоні від %d до %d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "Дисплей %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "Некоректний параметр kiosk-quit: %s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "Масштаб вікна, у відсотках" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "Відкрити у повноекранному режимі (узгоджує роздільність гостьової системи з роздільністю клієнта)" - -#: ../src/virt-viewer-app.c:2314 +msgstr "" +"Відкрити у повноекранному режимі (узгоджує роздільність гостьової системи з " +"роздільністю клієнта)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "Налаштувати клавіатурні скорочення" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "Увімкнути режим кіоску" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "Вийти за вказаної умови у режимі кіоску" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "Показати докладну інформацію" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "Показати діагностичну інформацію" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" +"Для встановлення з’єднання %s слід пройти розпізнавання:\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "Для встановлення з’єднання з %s слід пройти розпізнавання:\n" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "Потрібно пройти розпізнавання" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "мітка" @@ -340,6 +426,14 @@ msgid "Username:" msgstr "Користувач:" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "Показувати пароль" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "VNC не надає GUID" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -372,204 +466,252 @@ #: ../src/virt-viewer-main.c:80 #, c-format msgid "Run '%s --help' to see a full list of available command line options" -msgstr "Виконайте «%s --help», щоб побачити повний перелік доступних параметрів командного рядка." +msgstr "" +"Виконайте «%s --help», щоб побачити повний перелік доступних параметрів " +"командного рядка." #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "Графічна консоль віртуальної машини" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\nФормат: %s [ПАРАМЕТРИ] НАЗВА_ДОМЕНУ|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "некоректний пароль" +msgstr "" +"\n" +"Користування: %s [ПАРАМЕТРИ] [НАЗВА_ДОМЕНУ|ID|UUID]\n" +"\n" +"%s\n" +"\n" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" +"\n" +"Не вказано НАЗВИ_ДОМЕНУ|Ід.|UUID у «--wait»\n" +"\n" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "Некоректний пароль" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "Виберіть пристрої USB для переспрямування" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "Непідтримуваний тип розпізнавання %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "Не знайдено віртуальних машин" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "Не вибрано віртуальної машини" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "Знімок вікна" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "Невідомо" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "Від’єднатися" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "Вибір пристрою USB" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "Надіслати комбінацію ключів" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "Вийти з повноекранного режиму" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(Натисніть %s, щоб вивільнити вказівник)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s — %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" +"Для налаштовування цього з’єднання потрібна принаймні версія %s %s, див. %s, " +"щоб дізнатися більше" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "Для налаштовування цього з’єднання потрібна принаймні версія %s %s" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "Очікування на перезапуск гостьового домену" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "Не вдалося визначити тип графічної підсистеми для гостьової системи %s" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "Не вдалося визначити адресу графічного інтерфейсу для гостьової системи %s" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "Не вдалося визначити вузол для гостьової системи %s" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "Гостьова система «%s» недоступна" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "Віртуальну машину %s не запущено" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "Очікуємо на запуск libvirt" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "Пошук гостьового домену" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "Очікування на створення гостьового домену" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "Не вдалося знайти гостьовий домен %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "Перевірка стану гостьового домену" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "Не вдалося отримати стан гостьової системи" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "Очікування на запуск гостьового домену" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "Очікування на запуск сервера гостьового домену" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "Не вдається встановити з’єднання з libvirt за адресою URI %s" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "Не вдалося з’єднатися з libvirt з адресою %s." + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[немає]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "Спроба пройти розпізнавання зазнала невдачі." + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "Не вдалося з’єднатися: " + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "_Файл" @@ -582,30 +724,78 @@ msgid "Smartcard removal" msgstr "Вилучення картки пам’яті" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "Параметри" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "П_ерегляд" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "Повноекранний" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "_Масштаб" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "Екрани" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "Вивільнити вказівник" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "_Надіслати клавішу" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "_Довідка" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "Параметри _гостьової системи" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "Параметри гостьової системи" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "Назва:" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "GUID:" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "Виберіть віртуальну машину" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "Назва" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "Доступні віртуальні машини" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "Спільне використання тек" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "Оприлюднити теку" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "Лише читання" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "Spice" diff --git a/po/uk_UA.po b/po/uk_UA.po deleted file mode 100644 index 0e71592..0000000 --- a/po/uk_UA.po +++ /dev/null @@ -1,612 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 17:29+0000\n" -"PO-Revision-Date: 2014-01-24 17:29+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/fedora/language/uk_UA/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: uk_UA\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:111 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#. Setup command line options -#: ../src/remote-viewer-main.c:114 -msgid "- Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:131 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:143 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:150 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:284 ../src/remote-viewer.c:1030 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:299 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:597 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:885 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:900 -msgid "URL:" -msgstr "" - -#: ../src/remote-viewer.c:908 -msgid "Recent connections:" -msgstr "" - -#: ../src/remote-viewer.c:962 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:976 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1001 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1008 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1014 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1021 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2012 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:383 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:385 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:806 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:914 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:995 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:997 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1009 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1091 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1224 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1284 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1309 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1338 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1358 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1366 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1584 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2080 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2255 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2264 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2266 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2268 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2270 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2272 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2274 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2276 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:76 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:79 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#. Setup command line options -#: ../src/virt-viewer-main.c:84 -msgid "- Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:105 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:499 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:553 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:150 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:580 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:581 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:583 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:584 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:585 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:586 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:589 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1061 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1068 ../src/virt-viewer-window.c:1069 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1077 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1086 ../src/virt-viewer-window.c:1087 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1166 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1169 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1180 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1184 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:539 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:543 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:547 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:552 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:565 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:572 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:579 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:693 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:694 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Automatically resize" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:13 -msgid "_Help" -msgstr "" diff --git a/po/ur.po b/po/ur.po index 878a375..1645aaf 100644 --- a/po/ur.po +++ b/po/ur.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Urdu (http://www.transifex.com/projects/p/virt-viewer/language/ur/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Urdu\n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ur\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/uz.po b/po/uz.po deleted file mode 100644 index 98ffa88..0000000 --- a/po/uz.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Uzbek (http://www.transifex.com/projects/p/virt-viewer/language/uz/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: uz\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/vi.po b/po/vi.po index 0d0ca51..9b7d61b 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Vietnamese (http://www.transifex.com/projects/p/virt-viewer/language/vi/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Vietnamese\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: vi\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/wba.po b/po/wba.po new file mode 100644 index 0000000..2bc1bc8 --- /dev/null +++ b/po/wba.po @@ -0,0 +1,757 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: wba\n" +"Language: wba\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/wo.po b/po/wo.po deleted file mode 100644 index 79be991..0000000 --- a/po/wo.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Wolof (http://www.transifex.com/projects/p/virt-viewer/language/wo/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: wo\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/xh.po b/po/xh.po deleted file mode 100644 index 513aca5..0000000 --- a/po/xh.po +++ /dev/null @@ -1,610 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: virt-viewer\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Xhosa (http://www.transifex.com/projects/p/virt-viewer/language/xh/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: xh\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 -msgid "Remote Viewer" -msgstr "" - -#: ../data/remote-viewer.desktop.in.h:2 -msgid "Access remote desktops" -msgstr "" - -#: ../data/virt-viewer-mime.xml.in.h:1 -msgid "Virt-Viewer connection file" -msgstr "" - -#: ../src/gbinding.c:637 -msgid "Source" -msgstr "" - -#: ../src/gbinding.c:638 -msgid "The source of the binding" -msgstr "" - -#: ../src/gbinding.c:652 -msgid "Target" -msgstr "" - -#: ../src/gbinding.c:653 -msgid "The target of the binding" -msgstr "" - -#: ../src/gbinding.c:668 -msgid "Source Property" -msgstr "" - -#: ../src/gbinding.c:669 -msgid "The property on the source to bind" -msgstr "" - -#: ../src/gbinding.c:684 -msgid "Target Property" -msgstr "" - -#: ../src/gbinding.c:685 -msgid "The property on the target to bind" -msgstr "" - -#: ../src/gbinding.c:699 -msgid "Flags" -msgstr "" - -#: ../src/gbinding.c:700 -msgid "The binding flags" -msgstr "" - -#: ../src/remote-viewer-main.c:50 -#, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 -msgid "Display version information" -msgstr "" - -#: ../src/remote-viewer-main.c:101 -msgid "Set window title" -msgstr "" - -#: ../src/remote-viewer-main.c:104 -msgid "Open connection using Spice controller communication" -msgstr "" - -#: ../src/remote-viewer-main.c:116 -msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options\n" -msgstr "" - -#: ../src/remote-viewer-main.c:146 -#, c-format -msgid "Error: extra arguments given while using Spice controller\n" -msgstr "" - -#: ../src/remote-viewer-main.c:153 -#, c-format -msgid "Error: can't handle multiple URIs\n" -msgstr "" - -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 -msgid "Failed to initiate connection" -msgstr "" - -#: ../src/remote-viewer.c:294 -msgid "Display disabled by controller" -msgstr "" - -#: ../src/remote-viewer.c:592 -#, c-format -msgid "Controller connection failed: %s" -msgstr "" - -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" -msgstr "" - -#: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 -msgid "Setting up Spice session..." -msgstr "" - -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 -msgid "Cannot determine the connection type from URI" -msgstr "" - -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-about.xml.h:1 -msgid "About Glade" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:2 -msgid "" -"Copyright (C) 2007-2012 Daniel P. Berrange\n" -"Copyright (C) 2007-2014 Red Hat, Inc." -msgstr "" - -#: ../src/virt-viewer-about.xml.h:4 -msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:5 -msgid "virt-manager.org" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:6 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "" - -#: ../src/virt-viewer-about.xml.h:20 -msgid "The Fedora Translation Team" -msgstr "" - -#: ../src/virt-viewer-app.c:400 -msgid "Do you want to close the session?" -msgstr "" - -#: ../src/virt-viewer-app.c:402 -msgid "Do not ask me again" -msgstr "" - -#: ../src/virt-viewer-app.c:841 -#, c-format -msgid "Waiting for display %d..." -msgstr "" - -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 -msgid "Connect to ssh failed." -msgstr "" - -#: ../src/virt-viewer-app.c:1029 -msgid "Can't connect to channel, SSH only supported." -msgstr "" - -#: ../src/virt-viewer-app.c:1041 -msgid "Connect to channel unsupported." -msgstr "" - -#: ../src/virt-viewer-app.c:1123 -msgid "Connecting to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1256 -msgid "Guest domain has shutdown" -msgstr "" - -#: ../src/virt-viewer-app.c:1317 -msgid "Connected to graphic server" -msgstr "" - -#: ../src/virt-viewer-app.c:1344 -#, c-format -msgid "Unable to connect to the graphic server %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer-auth.xml.h:1 -msgid "Authentication required" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:2 -msgid "label" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:3 -msgid "Password:" -msgstr "" - -#: ../src/virt-viewer-auth.xml.h:4 -msgid "Username:" -msgstr "" - -#: ../src/virt-viewer-main.c:38 -#, c-format -msgid "%s version %s\n" -msgstr "" - -#: ../src/virt-viewer-main.c:62 -msgid "Direct connection with no automatic tunnels" -msgstr "" - -#: ../src/virt-viewer-main.c:64 -msgid "Attach to the local display using libvirt" -msgstr "" - -#: ../src/virt-viewer-main.c:66 -msgid "Connect to hypervisor" -msgstr "" - -#: ../src/virt-viewer-main.c:68 -msgid "Wait for domain to start" -msgstr "" - -#: ../src/virt-viewer-main.c:70 -msgid "Reconnect to domain upon restart" -msgstr "" - -#: ../src/virt-viewer-main.c:77 -msgid "Virt Viewer" -msgstr "" - -#: ../src/virt-viewer-main.c:80 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options" -msgstr "" - -#: ../src/virt-viewer-main.c:86 -msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 -#, c-format -msgid "" -"\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" -"\n" -"%s\n" -"\n" -msgstr "" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "" - -#. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 -msgid "Select USB devices for redirection" -msgstr "" - -#: ../src/virt-viewer-session-vnc.c:148 -#, c-format -msgid "Unsupported authentication type %d" -msgstr "" - -#: ../src/virt-viewer-window.c:587 -msgid "Ctrl+Alt+_Del" -msgstr "" - -#: ../src/virt-viewer-window.c:588 -msgid "Ctrl+Alt+_Backspace" -msgstr "" - -#: ../src/virt-viewer-window.c:590 -msgid "Ctrl+Alt+F_1" -msgstr "" - -#: ../src/virt-viewer-window.c:591 -msgid "Ctrl+Alt+F_2" -msgstr "" - -#: ../src/virt-viewer-window.c:592 -msgid "Ctrl+Alt+F_3" -msgstr "" - -#: ../src/virt-viewer-window.c:593 -msgid "Ctrl+Alt+F_4" -msgstr "" - -#: ../src/virt-viewer-window.c:594 -msgid "Ctrl+Alt+F_5" -msgstr "" - -#: ../src/virt-viewer-window.c:595 -msgid "Ctrl+Alt+F_6" -msgstr "" - -#: ../src/virt-viewer-window.c:596 -msgid "Ctrl+Alt+F_7" -msgstr "" - -#: ../src/virt-viewer-window.c:597 -msgid "Ctrl+Alt+F_8" -msgstr "" - -#: ../src/virt-viewer-window.c:598 -msgid "Ctrl+Alt+F_9" -msgstr "" - -#: ../src/virt-viewer-window.c:599 -msgid "Ctrl+Alt+F1_0" -msgstr "" - -#: ../src/virt-viewer-window.c:600 -msgid "Ctrl+Alt+F11" -msgstr "" - -#: ../src/virt-viewer-window.c:601 -msgid "Ctrl+Alt+F12" -msgstr "" - -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 -msgid "Screenshot" -msgstr "" - -#: ../src/virt-viewer-window.c:1051 -msgid "Disconnect" -msgstr "" - -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 -#: ../src/virt-viewer.xml.h:3 -msgid "USB device selection" -msgstr "" - -#: ../src/virt-viewer-window.c:1070 -msgid "Send key combination" -msgstr "" - -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 -msgid "Leave fullscreen" -msgstr "" - -#: ../src/virt-viewer-window.c:1162 -msgid "Ctrl+Alt" -msgstr "" - -#: ../src/virt-viewer-window.c:1165 -#, c-format -msgid "(Press %s to release pointer)" -msgstr "" - -#. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 -#, c-format -msgid "%s%s%s - %s" -msgstr "" - -#. translators: -#: ../src/virt-viewer-window.c:1180 -msgid " " -msgstr "" - -#: ../src/virt-viewer-file.c:624 -#, c-format -msgid "At least %s version %s is required to setup this connection" -msgstr "" - -#: ../src/virt-viewer.c:133 -msgid "Waiting for guest domain to re-start" -msgstr "" - -#: ../src/virt-viewer.c:318 -#, c-format -msgid "Cannot determine the graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 -#, c-format -msgid "Cannot determine the host for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:540 -msgid "Waiting for libvirt to start" -msgstr "" - -#: ../src/virt-viewer.c:544 -msgid "Finding guest domain" -msgstr "" - -#: ../src/virt-viewer.c:548 -msgid "Waiting for guest domain to be created" -msgstr "" - -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 -msgid "Checking guest domain status" -msgstr "" - -#: ../src/virt-viewer.c:573 -msgid "Waiting for guest domain to start" -msgstr "" - -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 -msgid "[none]" -msgstr "" - -#. * Local variables: -#. * c-indent-level: 4 -#. * c-basic-offset: 4 -#. * indent-tabs-mode: nil -#. * End: -#: ../src/virt-viewer.xml.h:1 -msgid "_File" -msgstr "" - -#: ../src/virt-viewer.xml.h:4 -msgid "Smartcard insertion" -msgstr "" - -#: ../src/virt-viewer.xml.h:5 -msgid "Smartcard removal" -msgstr "" - -#: ../src/virt-viewer.xml.h:6 -msgid "_View" -msgstr "" - -#: ../src/virt-viewer.xml.h:7 -msgid "Full screen" -msgstr "" - -#: ../src/virt-viewer.xml.h:8 -msgid "_Zoom" -msgstr "" - -#: ../src/virt-viewer.xml.h:9 -msgid "Displays" -msgstr "" - -#: ../src/virt-viewer.xml.h:10 -msgid "Release cursor" -msgstr "" - -#: ../src/virt-viewer.xml.h:11 -msgid "_Send key" -msgstr "" - -#: ../src/virt-viewer.xml.h:12 -msgid "_Help" -msgstr "" diff --git a/po/yo.po b/po/yo.po new file mode 100644 index 0000000..e602739 --- /dev/null +++ b/po/yo.po @@ -0,0 +1,757 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Yoruba\n" +"Language: yo\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: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 +msgid "Remote Viewer" +msgstr "" + +#: ../data/remote-viewer.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "" + +#: ../data/virt-viewer-mime.xml.in.h:1 +msgid "Virt-Viewer connection file" +msgstr "" + +#: ../src/gbinding.c:637 +msgid "Source" +msgstr "" + +#: ../src/gbinding.c:638 +msgid "The source of the binding" +msgstr "" + +#: ../src/gbinding.c:652 +msgid "Target" +msgstr "" + +#: ../src/gbinding.c:653 +msgid "The target of the binding" +msgstr "" + +#: ../src/gbinding.c:668 +msgid "Source Property" +msgstr "" + +#: ../src/gbinding.c:669 +msgid "The property on the source to bind" +msgstr "" + +#: ../src/gbinding.c:684 +msgid "Target Property" +msgstr "" + +#: ../src/gbinding.c:685 +msgid "The property on the target to bind" +msgstr "" + +#: ../src/gbinding.c:699 +msgid "Flags" +msgstr "" + +#: ../src/gbinding.c:700 +msgid "The binding flags" +msgstr "" + +#: ../src/remote-viewer-main.c:50 +#, c-format +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 +msgid "Display version information" +msgstr "" + +#: ../src/remote-viewer-main.c:105 +msgid "Set window title" +msgstr "" + +#: ../src/remote-viewer-main.c:108 +msgid "Open connection using Spice controller communication" +msgstr "" + +#: ../src/remote-viewer-main.c:120 +msgid "Remote viewer client" +msgstr "" + +#: ../src/remote-viewer-main.c:138 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options\n" +msgstr "" + +#: ../src/remote-viewer-main.c:149 +#, c-format +msgid "Error: extra arguments given while using Spice controller\n" +msgstr "" + +#: ../src/remote-viewer-main.c:156 +#, c-format +msgid "Error: can't handle multiple URIs\n" +msgstr "" + +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 +msgid "Failed to initiate connection" +msgstr "" + +#: ../src/remote-viewer.c:313 +msgid "Display disabled by controller" +msgstr "" + +#: ../src/remote-viewer.c:609 +#, c-format +msgid "Controller connection failed: %s" +msgstr "" + +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" +msgstr "" + +#: ../src/remote-viewer.c:951 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 +msgid "Setting up Spice session..." +msgstr "" + +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 +msgid "Cannot determine the connection type from URI" +msgstr "" + +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:1 +msgid "About Glade" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:2 +msgid "" +"Copyright (C) 2007-2012 Daniel P. Berrange\n" +"Copyright (C) 2007-2014 Red Hat, Inc." +msgstr "" + +#: ../src/virt-viewer-about.xml.h:4 +msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:5 +msgid "virt-manager.org" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:6 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" + +#: ../src/virt-viewer-about.xml.h:20 +msgid "The Fedora Translation Team" +msgstr "" + +#: ../src/virt-viewer-app.c:526 +msgid "Do you want to close the session?" +msgstr "" + +#: ../src/virt-viewer-app.c:528 +msgid "Do not ask me again" +msgstr "" + +#: ../src/virt-viewer-app.c:1008 +#, c-format +msgid "Waiting for display %d..." +msgstr "" + +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 +msgid "Connect to ssh failed." +msgstr "" + +#: ../src/virt-viewer-app.c:1202 +msgid "Can't connect to channel, SSH only supported." +msgstr "" + +#: ../src/virt-viewer-app.c:1214 +msgid "Connect to channel unsupported." +msgstr "" + +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 +msgid "Connecting to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1398 +msgid "Guest domain has shutdown" +msgstr "" + +#: ../src/virt-viewer-app.c:1459 +msgid "Connected to graphic server" +msgstr "" + +#: ../src/virt-viewer-app.c:1486 +#, c-format +msgid "Unable to connect to the graphic server %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer-auth.xml.h:1 +msgid "Authentication required" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 +msgid "label" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:3 +msgid "Password:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:4 +msgid "Username:" +msgstr "" + +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + +#: ../src/virt-viewer-main.c:38 +#, c-format +msgid "%s version %s\n" +msgstr "" + +#: ../src/virt-viewer-main.c:62 +msgid "Direct connection with no automatic tunnels" +msgstr "" + +#: ../src/virt-viewer-main.c:64 +msgid "Attach to the local display using libvirt" +msgstr "" + +#: ../src/virt-viewer-main.c:66 +msgid "Connect to hypervisor" +msgstr "" + +#: ../src/virt-viewer-main.c:68 +msgid "Wait for domain to start" +msgstr "" + +#: ../src/virt-viewer-main.c:70 +msgid "Reconnect to domain upon restart" +msgstr "" + +#: ../src/virt-viewer-main.c:77 +msgid "Virt Viewer" +msgstr "" + +#: ../src/virt-viewer-main.c:80 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options" +msgstr "" + +#: ../src/virt-viewer-main.c:86 +msgid "Virtual machine graphical console" +msgstr "" + +#: ../src/virt-viewer-main.c:107 +#, c-format +msgid "" +"\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" + +#. Create the widgets +#: ../src/virt-viewer-session-spice.c:786 +msgid "Select USB devices for redirection" +msgstr "" + +#: ../src/virt-viewer-session-vnc.c:153 +#, c-format +msgid "Unsupported authentication type %d" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 +msgid "Ctrl+Alt+_Del" +msgstr "" + +#: ../src/virt-viewer-window.c:538 +msgid "Ctrl+Alt+_Backspace" +msgstr "" + +#: ../src/virt-viewer-window.c:540 +msgid "Ctrl+Alt+F_1" +msgstr "" + +#: ../src/virt-viewer-window.c:541 +msgid "Ctrl+Alt+F_2" +msgstr "" + +#: ../src/virt-viewer-window.c:542 +msgid "Ctrl+Alt+F_3" +msgstr "" + +#: ../src/virt-viewer-window.c:543 +msgid "Ctrl+Alt+F_4" +msgstr "" + +#: ../src/virt-viewer-window.c:544 +msgid "Ctrl+Alt+F_5" +msgstr "" + +#: ../src/virt-viewer-window.c:545 +msgid "Ctrl+Alt+F_6" +msgstr "" + +#: ../src/virt-viewer-window.c:546 +msgid "Ctrl+Alt+F_7" +msgstr "" + +#: ../src/virt-viewer-window.c:547 +msgid "Ctrl+Alt+F_8" +msgstr "" + +#: ../src/virt-viewer-window.c:548 +msgid "Ctrl+Alt+F_9" +msgstr "" + +#: ../src/virt-viewer-window.c:549 +msgid "Ctrl+Alt+F1_0" +msgstr "" + +#: ../src/virt-viewer-window.c:550 +msgid "Ctrl+Alt+F11" +msgstr "" + +#: ../src/virt-viewer-window.c:551 +msgid "Ctrl+Alt+F12" +msgstr "" + +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 +msgid "Screenshot" +msgstr "" + +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 +msgid "Disconnect" +msgstr "" + +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 +#: ../src/virt-viewer.xml.h:3 +msgid "USB device selection" +msgstr "" + +#: ../src/virt-viewer-window.c:1081 +msgid "Send key combination" +msgstr "" + +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/virt-viewer-window.c:1173 +msgid "Ctrl+Alt" +msgstr "" + +#: ../src/virt-viewer-window.c:1176 +#, c-format +msgid "(Press %s to release pointer)" +msgstr "" + +#. translators: +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 +#, c-format +msgid "%s%s%s - %s" +msgstr "" + +#. translators: +#: ../src/virt-viewer-window.c:1191 +msgid " " +msgstr "" + +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 +#, c-format +msgid "At least %s version %s is required to setup this connection" +msgstr "" + +#: ../src/virt-viewer.c:163 +msgid "Waiting for guest domain to re-start" +msgstr "" + +#: ../src/virt-viewer.c:409 +#, c-format +msgid "Cannot determine the graphic type for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:448 +#, c-format +msgid "Cannot determine the host for the guest %s" +msgstr "" + +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 +msgid "Waiting for libvirt to start" +msgstr "" + +#: ../src/virt-viewer.c:724 +msgid "Finding guest domain" +msgstr "" + +#: ../src/virt-viewer.c:728 +msgid "Waiting for guest domain to be created" +msgstr "" + +#: ../src/virt-viewer.c:750 +msgid "Checking guest domain status" +msgstr "" + +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 +msgid "Waiting for guest domain to start" +msgstr "" + +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 +msgid "[none]" +msgstr "" + +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * End: +#. +#: ../src/virt-viewer.xml.h:1 +msgid "_File" +msgstr "" + +#: ../src/virt-viewer.xml.h:4 +msgid "Smartcard insertion" +msgstr "" + +#: ../src/virt-viewer.xml.h:5 +msgid "Smartcard removal" +msgstr "" + +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 +msgid "_View" +msgstr "" + +#: ../src/virt-viewer.xml.h:8 +msgid "Full screen" +msgstr "" + +#: ../src/virt-viewer.xml.h:9 +msgid "_Zoom" +msgstr "" + +#: ../src/virt-viewer.xml.h:10 +msgid "Displays" +msgstr "" + +#: ../src/virt-viewer.xml.h:11 +msgid "Release cursor" +msgstr "" + +#: ../src/virt-viewer.xml.h:12 +msgid "_Send key" +msgstr "" + +#: ../src/virt-viewer.xml.h:13 +msgid "_Help" +msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index a525fe2..cb7e99d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Aron Xu , 2010 # Christopher Meng , 2013 @@ -10,19 +10,21 @@ # Wei Liu , 2012-2013 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/virt-viewer/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/virt-" +"viewer/language/zh_CN/)\n" +"Language: zh-CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "远程查看程序" @@ -76,103 +78,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer 版本 %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "显示版本信息" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "设置窗口标题" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "使用 Spice 控制器沟通打开连接" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\n运行 '%s --help' 来查看可用命令行选项的完整列表\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"运行 '%s --help' 来查看可用命令行选项的完整列表\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "错误：使用 Spice 控制器时给出额外参数\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "错误：无法控制多个 URI\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "初始化连接失败" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "显示控制器禁用的" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "控制器连接失败：%s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "连接详情" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "无法生成 Spice 会话" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "设置 Spice 会话......" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "无效文件 %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "无法确定 URI 的连接类型" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "无法打开 oVirt 会话" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "无法为此类型生成会话：%s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "连接详情" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "关于 Glade" @@ -206,133 +246,162 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "本程序是免费软件，您可以根据自由软件基金发布的 GNU 通用公共许可证版本 2 或(您认为合适的)之后的版本重新发布和（/或）修改这个软件。\n\n发布本程序是希望它\n对您有帮助，但不做任何保证，\n也不保证可用于商业或适合特定目的。\n详情请查看 GNU 通用公共许可证。\n\n本程序附带 GNU 通用公共许可证；\n如果没有，请致电自由软件基金\n59 Temple Place, Suite 330, Boston, MA 02111-1307 USA⏎ \n" +msgstr "" +"本程序是免费软件，您可以根据自由软件基金发布的 GNU 通用公共许可证版本 2 或(您" +"认为合适的)之后的版本重新发布和（/或）修改这个软件。\n" +"\n" +"发布本程序是希望它\n" +"对您有帮助，但不做任何保证，\n" +"也不保证可用于商业或适合特定目的。\n" +"详情请查看 GNU 通用公共许可证。\n" +"\n" +"本程序附带 GNU 通用公共许可证；\n" +"如果没有，请致电自由软件基金\n" +"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA⏎ \n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora 翻译团队" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "您要关闭这个会话吗？" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "不要再问我" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "等待画面 %d......" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "虚拟机 %s 的未知图形类型" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "连接到 ssh 失败" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "无法连接到通道，只支持 SSH。" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "无法连接到不支持的通道。" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "正在连接到图形服务器" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "已关闭虚拟机域" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "已连接到图形服务器" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "无法连接到图形服务器 %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "无法使用 %s 中的远程桌面服务器验证：%s\n重新尝试连接？" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "无法使用远程桌面服务器验证：%s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB 重新定向错误：%s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "显示 %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "无效的 kiosk-quit 参数：%s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "窗口缩放级别，以百分比计" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" msgstr "" -#: ../src/virt-viewer-app.c:2314 +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "自定义快捷键" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "启用 kiosk 模式" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "显示详细信息" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "显示调试信息" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "所需验证" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "标签" @@ -344,6 +413,14 @@ msgid "Username:" msgstr "用户名：" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -382,198 +459,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\n用法：%s [选项] 域名|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "密码无效" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "为重新定向选择 USB 设备" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "不支持的验证类型 %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "截屏" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "断开连接" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB 设备选择" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "发送按键组合" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "离开全屏" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(按 %s 释放光标)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "等待虚拟机域重启" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "无法确定虚拟机 %s 的图形类型" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "无法确定虚拟机 %s 的图形地址" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "无法确定虚拟机 %s 的主机" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "等待 libvirt 启动" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "正在查找虚拟机域" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "正在等待生成虚拟机域" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "无法找到客户端域 %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "正在检查虚拟机域状态" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "正在等待虚拟机域启动" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "正在等待虚拟机域启动服务器" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "无法使用 URI %s 连接到 libvirt" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[无]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "文件（_F）" @@ -586,30 +699,78 @@ msgid "Smartcard removal" msgstr "删除智能卡" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "查看（_V）" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "全屏" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "缩放（_Z）" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "画面" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "释放光标" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "发送按键（_S）" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "帮助（_H）" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/zh_HK.po b/po/zh_HK.po index 0012c42..03edd8d 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/virt-viewer/language/zh_HK/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Chinese (Hong Kong SAR China)\n" +"Language: zh-HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_HK\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index ff56f01..bb90035 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Cheng-Chia Tseng , 2013 # Chester Cheng , 2013 @@ -10,19 +10,21 @@ # Walter Cheuk , 2012 msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: 2015-01-12 06:21-0500\n" "Last-Translator: Daniel Berrange \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/virt-viewer/language/zh_TW/)\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/virt-" +"viewer/language/zh_TW/)\n" +"Language: zh-TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"X-Generator: Zanata 3.7.3\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "遠端檢視器" @@ -76,103 +78,141 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "remote-viewer 版本 %s\n" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "顯示版本資訊" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "設定視窗標題" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "透過 Spice 控制器通訊來開啟連線" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" -msgstr "" - -#: ../src/remote-viewer-main.c:134 +msgstr "遠端檢視器客戶端" + +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" -msgstr "%s\n請執行「%s --help」以檢視可用指令選項的完整清單\n" - -#: ../src/remote-viewer-main.c:146 +msgstr "" +"%s\n" +"請執行「%s --help」以檢視可用指令選項的完整清單\n" + +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "錯誤：額使用 Spice 控制器時給定額外引數\n" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "錯誤：無法處理 URI\n" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "初始化連線失敗" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "畫面已被控制器停用" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "控制器連線失敗：%s" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "連線細節" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "無法建立 Spice 作業階段" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "正在設置 Spice 作業階段..." -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "無效的檔案 %s" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "無法從 URI 判斷連線類型" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "無法開啟 oVirt 作業階段" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "無法為此類型建立作業階段：%s" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "連線細節" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "例，spice://foo.example.org:5900" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "關於 Glade" @@ -182,6 +222,8 @@ "Copyright (C) 2007-2012 Daniel P. Berrange\n" "Copyright (C) 2007-2014 Red Hat, Inc." msgstr "" +"著作權 (C) 2007-2012 Daniel P. Berrange\n" +"著作權 (C) 2007-2014 Red Hat, Inc." #: ../src/virt-viewer-about.xml.h:4 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt" @@ -206,133 +248,165 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -msgstr "此程式為自由軟體；您可將它重新發佈與/或對它進行修改，\n您必須同意自由軟體基金會 (Free Software Foundation) 的 GNU 通用\n公共許可證 (GNU General Public License) 的授權條款；許可證\n版本 2 或任何更新的版本。\n\n此程式乃為了方便社群使用，不過\n卻不含任何使用上的保証；甚至沒有任何適銷性上\n以及特定使用對象的保証。 欲取得更多詳細\n資訊，請參閱 GNU 通用公共許可證。\n\n當您取得此程式時，您應同時取得了\n一份 GNU 通用公共許可證。若沒有的話，請聯絡自由軟體\n基金會（Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"此程式為自由軟體；您可將它重新發佈與/或對它進行修改，\n" +"您必須同意自由軟體基金會 (Free Software Foundation) 的 GNU 通用\n" +"公共許可證 (GNU General Public License) 的授權條款；許可證\n" +"版本 2 或任何更新的版本。\n" +"\n" +"此程式乃為了方便社群使用，不過\n" +"卻不含任何使用上的保証；甚至沒有任何適銷性上\n" +"以及特定使用對象的保証。 欲取得更多詳細\n" +"資訊，請參閱 GNU 通用公共許可證。\n" +"\n" +"當您取得此程式時，您應同時取得了\n" +"一份 GNU 通用公共許可證。若沒有的話，請聯絡自由軟體\n" +"基金會（Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, " +"MA 02111-1307 USA\n" #: ../src/virt-viewer-about.xml.h:20 msgid "The Fedora Translation Team" msgstr "Fedora 翻譯團隊" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "您是否希望關閉本作業階段？" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "不再詢問我" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "正在等候顯示器 %d..." -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "客端 %s 的圖形類型不明" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "連至 ssh 的連線失敗。" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "無法連至頻道，僅支援 SSH。" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "不支援頻道的連接。" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "正在連接圖形化伺服器" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "客端網域已關閉" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "已連上圖形化伺服器" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "無法連接圖形化伺服器 %s" -#: ../src/virt-viewer-app.c:1376 -#, c-format -msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "無法在位於 %s 的遠端桌面伺服器上驗證：%s\n重新嘗試連線？" - -#: ../src/virt-viewer-app.c:1396 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 #, c-format msgid "Unable to authenticate with remote desktop server: %s" msgstr "無法在遠端桌面伺服器驗證：%s" -#: ../src/virt-viewer-app.c:1404 +#: ../src/virt-viewer-app.c:1533 #, c-format msgid "USB redirection error: %s" msgstr "USB 重新導引錯誤：%s" -#: ../src/virt-viewer-app.c:1632 +#: ../src/virt-viewer-app.c:1786 #, c-format msgid "Zoom level must be within %d-%d\n" msgstr "遠近等級必須介於 %d-%d\n" -#: ../src/virt-viewer-app.c:2126 +#: ../src/virt-viewer-app.c:2296 #, c-format msgid "Display %d" msgstr "顯示 %d" -#: ../src/virt-viewer-app.c:2301 +#: ../src/virt-viewer-app.c:2552 #, c-format msgid "Invalid kiosk-quit argument: %s" msgstr "無效的 kiosk-quit 引數：%s" -#: ../src/virt-viewer-app.c:2310 +#: ../src/virt-viewer-app.c:2561 msgid "Zoom level of window, in percentage" msgstr "視窗放大等級，單位為百分比" -#: ../src/virt-viewer-app.c:2312 +#: ../src/virt-viewer-app.c:2563 msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 +msgstr "以全螢幕模式開啟 (調整客端解析度以適應客戶端)" + +#: ../src/virt-viewer-app.c:2565 msgid "Customise hotkeys" msgstr "自訂快速鍵" -#: ../src/virt-viewer-app.c:2316 +#: ../src/virt-viewer-app.c:2567 msgid "Enable kiosk mode" msgstr "啟用 kiosk 模式" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "Quit on given condition in kiosk mode" msgstr "於 kiosk 模式中的指定情況下離開" -#: ../src/virt-viewer-app.c:2318 +#: ../src/virt-viewer-app.c:2569 msgid "" msgstr "" -#: ../src/virt-viewer-app.c:2320 +#: ../src/virt-viewer-app.c:2571 msgid "Display verbose information" msgstr "顯示詳細資訊" -#: ../src/virt-viewer-app.c:2322 +#: ../src/virt-viewer-app.c:2573 msgid "Display debugging information" msgstr "顯示除錯資訊" +#: ../src/virt-viewer-auth.c:88 +#, c-format +msgid "" +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "須要通過驗證" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "標籤" @@ -344,6 +418,14 @@ msgid "Username:" msgstr "使用者名稱：" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -380,200 +462,236 @@ #: ../src/virt-viewer-main.c:86 msgid "Virtual machine graphical console" -msgstr "" - -#: ../src/virt-viewer-main.c:108 +msgstr "虛擬機圖形化主控臺" + +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" -msgstr "\n用法：%s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n" - -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" -msgstr "無效的密碼" +msgstr "" + +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" +msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "選擇欲重新導引的 USB 裝置" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "不支援的認證類型 %d" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "Ctrl+Alt+_Del" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "Ctrl+Alt+_Backspace" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "Ctrl+Alt+F_1" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "Ctrl+Alt+F_2" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "Ctrl+Alt+F_3" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "Ctrl+Alt+F_4" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "Ctrl+Alt+F_5" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "Ctrl+Alt+F_6" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "Ctrl+Alt+F_7" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "Ctrl+Alt+F_8" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "Ctrl+Alt+F_9" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "Ctrl+Alt+F1_0" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "Ctrl+Alt+F11" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "Ctrl+Alt+F12" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "螢幕快照" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "中斷連接" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "USB 裝置選取" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "傳送按鍵組合" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "離開全螢幕" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "Ctrl+Alt" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "(按下 %s 以釋放游標)" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "%s%s%s - %s" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr " " -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "至少需要 %s 版本 %s 以上才能設置此連線" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "正在等候客端網域重新啓用" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "無法判斷客端 %s 的圖形化類型為何" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "無法判斷客端 %s 的圖形化位址為何" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "無法判斷客端 %s 的主機為何" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "等候 libvirt 啟動" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "正在尋找客端網域" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "正在等候客端網域被建立" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "找不到客端網域 %s" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "正在檢查客端網域狀態" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "正在等候客端網域啟動" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "正在等候客端網域啟動伺服器" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "無法透過 %s URI 與 libvirt 連線" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "[無]" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "檔案(_F)" @@ -586,30 +704,78 @@ msgid "Smartcard removal" msgstr "智慧卡移除" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "檢視(_V)" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "全螢幕" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "遠近(_Z)" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "顯示" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "釋放游標" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "傳送按鍵(_S)" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "求助(_H)" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/po/zu.po b/po/zu.po index 4c03f8c..66ff574 100644 --- a/po/zu.po +++ b/po/zu.po @@ -1,23 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Translators: +# FIRST AUTHOR , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: virt-viewer\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 11:04+0100\n" -"PO-Revision-Date: 2014-07-21 10:04+0000\n" -"Last-Translator: Daniel Berrange \n" -"Language-Team: Zulu (http://www.transifex.com/projects/p/virt-viewer/language/zu/)\n" +"POT-Creation-Date: 2015-12-07 14:30+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: Zulu\n" +"Language: zu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zu\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112 +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.5.1\n" + +#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116 msgid "Remote Viewer" msgstr "" @@ -71,103 +72,139 @@ #: ../src/remote-viewer-main.c:50 #, c-format -msgid "remote-viewer version %s\n" -msgstr "" - -#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60 +msgid "remote-viewer version %s" +msgstr "" + +#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60 msgid "Display version information" msgstr "" -#: ../src/remote-viewer-main.c:101 +#: ../src/remote-viewer-main.c:105 msgid "Set window title" msgstr "" -#: ../src/remote-viewer-main.c:104 +#: ../src/remote-viewer-main.c:108 msgid "Open connection using Spice controller communication" msgstr "" -#: ../src/remote-viewer-main.c:116 +#: ../src/remote-viewer-main.c:120 msgid "Remote viewer client" msgstr "" -#: ../src/remote-viewer-main.c:134 +#: ../src/remote-viewer-main.c:138 #, c-format msgid "" "%s\n" "Run '%s --help' to see a full list of available command line options\n" msgstr "" -#: ../src/remote-viewer-main.c:146 +#: ../src/remote-viewer-main.c:149 #, c-format msgid "Error: extra arguments given while using Spice controller\n" msgstr "" -#: ../src/remote-viewer-main.c:153 +#: ../src/remote-viewer-main.c:156 #, c-format msgid "Error: can't handle multiple URIs\n" msgstr "" -#: ../src/remote-viewer.c:279 ../src/remote-viewer.c:1084 +#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159 msgid "Failed to initiate connection" msgstr "" -#: ../src/remote-viewer.c:294 +#: ../src/remote-viewer.c:313 msgid "Display disabled by controller" msgstr "" -#: ../src/remote-viewer.c:592 +#: ../src/remote-viewer.c:609 #, c-format msgid "Controller connection failed: %s" msgstr "" -#. Create the widgets -#: ../src/remote-viewer.c:924 -msgid "Connection details" -msgstr "" - -#: ../src/remote-viewer.c:939 -msgid "_Connection Address" +#: ../src/remote-viewer.c:755 +msgid "_Change CD" +msgstr "" + +#: ../src/remote-viewer.c:855 +msgid "failed to parse ovirt uri" +msgstr "" + +#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924 +msgid "Authentication was cancelled" +msgstr "" + +#: ../src/remote-viewer.c:900 +#, c-format +msgid "oVirt VM %s is not running" +msgstr "" + +#: ../src/remote-viewer.c:914 +#, c-format +msgid "oVirt VM %s has no display" +msgstr "" + +#: ../src/remote-viewer.c:940 +#, c-format +msgid "oVirt VM %s has no host information" msgstr "" #: ../src/remote-viewer.c:951 -msgid "For example, spice://foo.example.org:5900" -msgstr "" - -#: ../src/remote-viewer.c:964 -msgid "_Recent Connections" -msgstr "" - -#: ../src/remote-viewer.c:1020 -msgid "Couldn't create a Spice session" -msgstr "" - -#: ../src/remote-viewer.c:1034 +#, c-format +msgid "oVirt VM %s has unknown display type: %d" +msgstr "" + +#: ../src/remote-viewer.c:1094 msgid "Setting up Spice session..." msgstr "" -#: ../src/remote-viewer.c:1055 -#, c-format -msgid "Invalid file %s" -msgstr "" - -#: ../src/remote-viewer.c:1062 +#: ../src/remote-viewer.c:1102 +msgid "No connection was chosen" +msgstr "" + +#: ../src/remote-viewer.c:1120 +#, c-format +msgid "Invalid file %s: " +msgstr "" + +#: ../src/remote-viewer.c:1128 msgid "Cannot determine the connection type from URI" msgstr "" -#: ../src/remote-viewer.c:1068 -msgid "Couldn't open oVirt session" -msgstr "" - -#: ../src/remote-viewer.c:1075 -#, c-format -msgid "Couldn't create a session for this type: %s" -msgstr "" - +#: ../src/remote-viewer.c:1134 +msgid "Couldn't open oVirt session: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. +#: ../src/remote-viewer-connect.xml.h:1 +msgid "Connection details" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:2 +msgid "Connection Address" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:3 +msgid "For example, spice://foo.example.org:5900" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:4 +msgid "Recent connections" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:5 +msgid "Cancel" +msgstr "" + +#: ../src/remote-viewer-connect.xml.h:6 +msgid "Connect" +msgstr "" + #: ../src/virt-viewer-about.xml.h:1 msgid "About Glade" msgstr "" @@ -207,127 +244,145 @@ msgid "The Fedora Translation Team" msgstr "" -#: ../src/virt-viewer-app.c:400 +#: ../src/virt-viewer-app.c:526 msgid "Do you want to close the session?" msgstr "" -#: ../src/virt-viewer-app.c:402 +#: ../src/virt-viewer-app.c:528 msgid "Do not ask me again" msgstr "" -#: ../src/virt-viewer-app.c:841 +#: ../src/virt-viewer-app.c:1008 #, c-format msgid "Waiting for display %d..." msgstr "" -#: ../src/virt-viewer-app.c:946 -#, c-format -msgid "Unknown graphic type for the guest %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1027 +#: ../src/virt-viewer-app.c:1117 +#, c-format +msgid "Unsupported graphic type '%s'" +msgstr "" + +#: ../src/virt-viewer-app.c:1200 msgid "Connect to ssh failed." msgstr "" -#: ../src/virt-viewer-app.c:1029 +#: ../src/virt-viewer-app.c:1202 msgid "Can't connect to channel, SSH only supported." msgstr "" -#: ../src/virt-viewer-app.c:1041 +#: ../src/virt-viewer-app.c:1214 msgid "Connect to channel unsupported." msgstr "" -#: ../src/virt-viewer-app.c:1123 +#: ../src/virt-viewer-app.c:1276 +msgid "Display can only be attached through libvirt with --attach" +msgstr "" + +#: ../src/virt-viewer-app.c:1299 msgid "Connecting to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1256 +#: ../src/virt-viewer-app.c:1398 msgid "Guest domain has shutdown" msgstr "" -#: ../src/virt-viewer-app.c:1317 +#: ../src/virt-viewer-app.c:1459 msgid "Connected to graphic server" msgstr "" -#: ../src/virt-viewer-app.c:1344 +#: ../src/virt-viewer-app.c:1486 #, c-format msgid "Unable to connect to the graphic server %s" msgstr "" -#: ../src/virt-viewer-app.c:1376 +#: ../src/virt-viewer-app.c:1512 +#, c-format +msgid "Unable to authenticate with remote desktop server at %s: %s\n" +msgstr "" + +#: ../src/virt-viewer-app.c:1525 +#, c-format +msgid "Unable to authenticate with remote desktop server: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1533 +#, c-format +msgid "USB redirection error: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:1786 +#, c-format +msgid "Zoom level must be within %d-%d\n" +msgstr "" + +#: ../src/virt-viewer-app.c:2296 +#, c-format +msgid "Display %d" +msgstr "" + +#: ../src/virt-viewer-app.c:2552 +#, c-format +msgid "Invalid kiosk-quit argument: %s" +msgstr "" + +#: ../src/virt-viewer-app.c:2561 +msgid "Zoom level of window, in percentage" +msgstr "" + +#: ../src/virt-viewer-app.c:2563 +msgid "Open in full screen mode (adjusts guest resolution to fit the client)" +msgstr "" + +#: ../src/virt-viewer-app.c:2565 +msgid "Customise hotkeys" +msgstr "" + +#: ../src/virt-viewer-app.c:2567 +msgid "Enable kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "Quit on given condition in kiosk mode" +msgstr "" + +#: ../src/virt-viewer-app.c:2569 +msgid "" +msgstr "" + +#: ../src/virt-viewer-app.c:2571 +msgid "Display verbose information" +msgstr "" + +#: ../src/virt-viewer-app.c:2573 +msgid "Display debugging information" +msgstr "" + +#: ../src/virt-viewer-auth.c:88 #, c-format msgid "" -"Unable to authenticate with remote desktop server at %s: %s\n" -"Retry connection again?" -msgstr "" - -#: ../src/virt-viewer-app.c:1396 -#, c-format -msgid "Unable to authenticate with remote desktop server: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1404 -#, c-format -msgid "USB redirection error: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:1632 -#, c-format -msgid "Zoom level must be within %d-%d\n" -msgstr "" - -#: ../src/virt-viewer-app.c:2126 -#, c-format -msgid "Display %d" -msgstr "" - -#: ../src/virt-viewer-app.c:2301 -#, c-format -msgid "Invalid kiosk-quit argument: %s" -msgstr "" - -#: ../src/virt-viewer-app.c:2310 -msgid "Zoom level of window, in percentage" -msgstr "" - -#: ../src/virt-viewer-app.c:2312 -msgid "Open in full screen mode (adjusts guest resolution to fit the client)" -msgstr "" - -#: ../src/virt-viewer-app.c:2314 -msgid "Customise hotkeys" -msgstr "" - -#: ../src/virt-viewer-app.c:2316 -msgid "Enable kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "Quit on given condition in kiosk mode" -msgstr "" - -#: ../src/virt-viewer-app.c:2318 -msgid "" -msgstr "" - -#: ../src/virt-viewer-app.c:2320 -msgid "Display verbose information" -msgstr "" - -#: ../src/virt-viewer-app.c:2322 -msgid "Display debugging information" -msgstr "" - +"Authentication is required for the %s connection to:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-auth.c:92 +#, c-format +msgid "Authentication is required for the %s connection:\n" +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer-auth.xml.h:1 msgid "Authentication required" msgstr "" -#: ../src/virt-viewer-auth.xml.h:2 +#: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4 msgid "label" msgstr "" @@ -339,6 +394,14 @@ msgid "Username:" msgstr "" +#: ../src/virt-viewer-auth.xml.h:5 +msgid "Show password" +msgstr "" + +#: ../src/virt-viewer-display-vnc.c:133 +msgid "VNC does not provide GUID" +msgstr "" + #: ../src/virt-viewer-main.c:38 #, c-format msgid "%s version %s\n" @@ -377,198 +440,234 @@ msgid "Virtual machine graphical console" msgstr "" -#: ../src/virt-viewer-main.c:108 +#: ../src/virt-viewer-main.c:107 #, c-format msgid "" "\n" -"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n" +"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n" "\n" "%s\n" "\n" msgstr "" -#: ../src/virt-viewer-session-spice.c:506 -msgid "invalid password" +#: ../src/virt-viewer-main.c:112 +#, c-format +msgid "" +"\n" +"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n" +"\n" +msgstr "" + +#: ../src/virt-viewer-session-spice.c:694 +msgid "Invalid password" msgstr "" #. Create the widgets -#: ../src/virt-viewer-session-spice.c:588 +#: ../src/virt-viewer-session-spice.c:786 msgid "Select USB devices for redirection" msgstr "" -#: ../src/virt-viewer-session-vnc.c:148 +#: ../src/virt-viewer-session-vnc.c:153 #, c-format msgid "Unsupported authentication type %d" msgstr "" -#: ../src/virt-viewer-window.c:587 +#: ../src/virt-viewer-vm-connection.c:64 +msgid "No virtual machine found" +msgstr "" + +#: ../src/virt-viewer-vm-connection.c:93 +msgid "No virtual machine was chosen" +msgstr "" + +#: ../src/virt-viewer-window.c:537 msgid "Ctrl+Alt+_Del" msgstr "" -#: ../src/virt-viewer-window.c:588 +#: ../src/virt-viewer-window.c:538 msgid "Ctrl+Alt+_Backspace" msgstr "" -#: ../src/virt-viewer-window.c:590 +#: ../src/virt-viewer-window.c:540 msgid "Ctrl+Alt+F_1" msgstr "" -#: ../src/virt-viewer-window.c:591 +#: ../src/virt-viewer-window.c:541 msgid "Ctrl+Alt+F_2" msgstr "" -#: ../src/virt-viewer-window.c:592 +#: ../src/virt-viewer-window.c:542 msgid "Ctrl+Alt+F_3" msgstr "" -#: ../src/virt-viewer-window.c:593 +#: ../src/virt-viewer-window.c:543 msgid "Ctrl+Alt+F_4" msgstr "" -#: ../src/virt-viewer-window.c:594 +#: ../src/virt-viewer-window.c:544 msgid "Ctrl+Alt+F_5" msgstr "" -#: ../src/virt-viewer-window.c:595 +#: ../src/virt-viewer-window.c:545 msgid "Ctrl+Alt+F_6" msgstr "" -#: ../src/virt-viewer-window.c:596 +#: ../src/virt-viewer-window.c:546 msgid "Ctrl+Alt+F_7" msgstr "" -#: ../src/virt-viewer-window.c:597 +#: ../src/virt-viewer-window.c:547 msgid "Ctrl+Alt+F_8" msgstr "" -#: ../src/virt-viewer-window.c:598 +#: ../src/virt-viewer-window.c:548 msgid "Ctrl+Alt+F_9" msgstr "" -#: ../src/virt-viewer-window.c:599 +#: ../src/virt-viewer-window.c:549 msgid "Ctrl+Alt+F1_0" msgstr "" -#: ../src/virt-viewer-window.c:600 +#: ../src/virt-viewer-window.c:550 msgid "Ctrl+Alt+F11" msgstr "" -#: ../src/virt-viewer-window.c:601 +#: ../src/virt-viewer-window.c:551 msgid "Ctrl+Alt+F12" msgstr "" -#: ../src/virt-viewer-window.c:975 ../src/virt-viewer.xml.h:2 +#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2 msgid "Screenshot" msgstr "" -#: ../src/virt-viewer-window.c:1051 +#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004 +msgid "Unknown" +msgstr "" + +#: ../src/virt-viewer-window.c:1062 msgid "Disconnect" msgstr "" -#: ../src/virt-viewer-window.c:1060 ../src/virt-viewer-window.c:1061 +#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072 #: ../src/virt-viewer.xml.h:3 msgid "USB device selection" msgstr "" -#: ../src/virt-viewer-window.c:1070 +#: ../src/virt-viewer-window.c:1081 msgid "Send key combination" msgstr "" -#: ../src/virt-viewer-window.c:1079 ../src/virt-viewer-window.c:1080 +#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091 msgid "Leave fullscreen" msgstr "" -#: ../src/virt-viewer-window.c:1162 +#: ../src/virt-viewer-window.c:1173 msgid "Ctrl+Alt" msgstr "" -#: ../src/virt-viewer-window.c:1165 +#: ../src/virt-viewer-window.c:1176 #, c-format msgid "(Press %s to release pointer)" msgstr "" #. translators: -#. * This is " - -#. " -#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt -#. Viewer" -#: ../src/virt-viewer-window.c:1176 +#. * This is " - " +#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer" +#. +#: ../src/virt-viewer-window.c:1187 #, c-format msgid "%s%s%s - %s" msgstr "" #. translators: -#: ../src/virt-viewer-window.c:1180 +#: ../src/virt-viewer-window.c:1191 msgid " " msgstr "" -#: ../src/virt-viewer-file.c:624 +#: ../src/virt-viewer-file.c:825 +#, c-format +msgid "" +"At least %s version %s is required to setup this connection, see %s for " +"details" +msgstr "" + +#: ../src/virt-viewer-file.c:833 #, c-format msgid "At least %s version %s is required to setup this connection" msgstr "" -#: ../src/virt-viewer.c:133 +#: ../src/virt-viewer.c:163 msgid "Waiting for guest domain to re-start" msgstr "" -#: ../src/virt-viewer.c:318 +#: ../src/virt-viewer.c:409 #, c-format msgid "Cannot determine the graphic type for the guest %s" msgstr "" -#: ../src/virt-viewer.c:341 -#, c-format -msgid "Cannot determine the graphic address for the guest %s" -msgstr "" - -#: ../src/virt-viewer.c:354 +#: ../src/virt-viewer.c:448 #, c-format msgid "Cannot determine the host for the guest %s" msgstr "" -#: ../src/virt-viewer.c:540 +#: ../src/virt-viewer.c:476 +#, c-format +msgid "Guest '%s' is not reachable" +msgstr "" + +#: ../src/virt-viewer.c:697 +#, c-format +msgid "Virtual machine %s is not running" +msgstr "" + +#: ../src/virt-viewer.c:720 msgid "Waiting for libvirt to start" msgstr "" -#: ../src/virt-viewer.c:544 +#: ../src/virt-viewer.c:724 msgid "Finding guest domain" msgstr "" -#: ../src/virt-viewer.c:548 +#: ../src/virt-viewer.c:728 msgid "Waiting for guest domain to be created" msgstr "" -#: ../src/virt-viewer.c:553 -#, c-format -msgid "Cannot find guest domain %s" -msgstr "" - -#: ../src/virt-viewer.c:566 +#: ../src/virt-viewer.c:750 msgid "Checking guest domain status" msgstr "" -#: ../src/virt-viewer.c:573 +#: ../src/virt-viewer.c:753 +msgid "Cannot get guest state" +msgstr "" + +#: ../src/virt-viewer.c:759 msgid "Waiting for guest domain to start" msgstr "" -#: ../src/virt-viewer.c:580 -msgid "Waiting for guest domain to start server" -msgstr "" - -#: ../src/virt-viewer.c:694 -#, c-format -msgid "Unable to connect to libvirt with URI %s" -msgstr "" - -#: ../src/virt-viewer.c:695 +#: ../src/virt-viewer.c:863 +#, c-format +msgid "Unable to connect to libvirt with URI: %s." +msgstr "" + +#: ../src/virt-viewer.c:864 msgid "[none]" msgstr "" +#: ../src/virt-viewer.c:871 +msgid "Authentication failed." +msgstr "" + +#: ../src/virt-viewer.c:931 +msgid "Failed to connect: " +msgstr "" + +#. #. * Local variables: #. * c-indent-level: 4 #. * c-basic-offset: 4 #. * indent-tabs-mode: nil #. * End: +#. #: ../src/virt-viewer.xml.h:1 msgid "_File" msgstr "" @@ -581,30 +680,78 @@ msgid "Smartcard removal" msgstr "" -#: ../src/virt-viewer.xml.h:6 +#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1 +msgid "Preferences" +msgstr "" + +#: ../src/virt-viewer.xml.h:7 msgid "_View" msgstr "" -#: ../src/virt-viewer.xml.h:7 +#: ../src/virt-viewer.xml.h:8 msgid "Full screen" msgstr "" -#: ../src/virt-viewer.xml.h:8 +#: ../src/virt-viewer.xml.h:9 msgid "_Zoom" msgstr "" -#: ../src/virt-viewer.xml.h:9 +#: ../src/virt-viewer.xml.h:10 msgid "Displays" msgstr "" -#: ../src/virt-viewer.xml.h:10 +#: ../src/virt-viewer.xml.h:11 msgid "Release cursor" msgstr "" -#: ../src/virt-viewer.xml.h:11 +#: ../src/virt-viewer.xml.h:12 msgid "_Send key" msgstr "" -#: ../src/virt-viewer.xml.h:12 +#: ../src/virt-viewer.xml.h:13 msgid "_Help" msgstr "" + +#: ../src/virt-viewer.xml.h:14 +msgid "_Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:1 +msgid "Guest Details" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:2 +msgid "Name:" +msgstr "" + +#: ../src/virt-viewer-guest-details.xml.h:3 +msgid "GUID:" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:1 +msgid "Choose a virtual machine" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:2 +msgid "Name" +msgstr "" + +#: ../src/virt-viewer-vm-connection.xml.h:3 +msgid "Available virtual machines" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:2 +msgid "Folder sharing" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:3 +msgid "Share folder" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:4 +msgid "Read-only" +msgstr "" + +#: ../src/virt-viewer-preferences.xml.h:5 +msgid "Spice" +msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index b3a9637..1ebc24e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,12 +2,18 @@ LDADD = MAINTAINERCLEANFILES = bin_PROGRAMS = + +noinst_LTLIBRARIES = libvirt-viewer.la builderxmldir = $(pkgdatadir)/ui builderxml_DATA = \ virt-viewer.xml \ virt-viewer-about.xml \ virt-viewer-auth.xml \ + virt-viewer-guest-details.xml \ + virt-viewer-vm-connection.xml \ + virt-viewer-preferences.xml \ + remote-viewer-connect.xml \ $(NULL) EXTRA_DIST = \ @@ -32,19 +38,29 @@ sed -e 's/VIRT_TYPE_VIEWER/VIRT_VIEWER_TYPE/' \ -e 's,#include "$(srcdir)/,#include ",' > $@ -COMMON_SOURCES = \ +libvirt_viewer_la_SOURCES = \ $(BUILT_SOURCES) \ virt-glib-compat.h \ virt-glib-compat.c \ virt-gtk-compat.h \ - virt-viewer-util.h virt-viewer-util.c \ - virt-viewer-auth.h virt-viewer-auth.c \ - virt-viewer-app.h virt-viewer-app.c \ - virt-viewer-file.h virt-viewer-file.c \ - virt-viewer-session.h virt-viewer-session.c \ - virt-viewer-display.h virt-viewer-display.c \ - virt-viewer-notebook.h virt-viewer-notebook.c \ - virt-viewer-window.h virt-viewer-window.c \ + virt-viewer-util.h \ + virt-viewer-util.c \ + virt-viewer-auth.h \ + virt-viewer-auth.c \ + virt-viewer-app.h \ + virt-viewer-app.c \ + virt-viewer-file.h \ + virt-viewer-file.c \ + virt-viewer-session.h \ + virt-viewer-session.c \ + virt-viewer-display.h \ + virt-viewer-display.c \ + virt-viewer-notebook.h \ + virt-viewer-notebook.c \ + virt-viewer-window.h \ + virt-viewer-window.c \ + virt-viewer-vm-connection.h \ + virt-viewer-vm-connection.c \ view/autoDrawer.c \ view/autoDrawer.h \ view/drawer.c \ @@ -54,81 +70,122 @@ $(NULL) if HAVE_GTK_VNC -COMMON_SOURCES += \ - virt-viewer-session-vnc.h virt-viewer-session-vnc.c \ - virt-viewer-display-vnc.h virt-viewer-display-vnc.c \ +libvirt_viewer_la_SOURCES += \ + virt-viewer-session-vnc.h \ + virt-viewer-session-vnc.c \ + virt-viewer-display-vnc.h \ + virt-viewer-display-vnc.c \ $(NULL) endif if HAVE_SPICE_GTK -COMMON_SOURCES += \ - virt-viewer-session-spice.h virt-viewer-session-spice.c \ - virt-viewer-display-spice.h virt-viewer-display-spice.c \ - $(NULL) -endif - - -if HAVE_LIBVIRT -bin_PROGRAMS += virt-viewer -virt_viewer_SOURCES = \ - $(COMMON_SOURCES) \ - virt-viewer-events.h virt-viewer-events.c \ - virt-viewer.h virt-viewer.c \ - virt-viewer-main.c \ - $(NULL) -virt_viewer_LDFLAGS = \ +libvirt_viewer_la_SOURCES += \ + virt-viewer-session-spice.h \ + virt-viewer-session-spice.c \ + virt-viewer-display-spice.h \ + virt-viewer-display-spice.c \ + $(NULL) +endif + +if HAVE_OVIRT +libvirt_viewer_la_SOURCES += \ + ovirt-foreign-menu.h \ + ovirt-foreign-menu.c \ + $(NULL) +endif + +COMMON_LIBS = \ -lm \ $(GLIB2_LIBS) \ $(GTK_LIBS) \ $(GTK_VNC_LIBS) \ + $(SPICE_GTK_LIBS) \ $(LIBXML2_LIBS) \ - $(LIBVIRT_LIBS) \ - $(OVIRT_LIBS) \ - $(SPICE_GTK_LIBS) \ - $(NULL) -virt_viewer_CFLAGS = \ + $(OVIRT_LIBS) \ + $(NULL) + +COMMON_CFLAGS = \ + -DLOCALE_DIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"virt-viewer\" \ + $(GLIB2_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GTK_VNC_CFLAGS) \ + $(SPICE_GTK_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(OVIRT_CFLAGS) \ + $(WARN_CFLAGS) \ + $(NULL) + + +libvirt_viewer_la_LIBADD = \ + $(COMMON_LIBS) \ + $(NULL) + +libvirt_viewer_la_CFLAGS = \ + $(COMMON_CFLAGS) + $(NULL) + +check_PROGRAMS = test-version-compare +TESTS = $(check_PROGRAMS) +test_version_compare_SOURCES = \ + virt-viewer-util.c \ + virt-viewer-util.h \ + test-version-compare.c \ + $(NULL) +test_version_compare_LDFLAGS = \ + $(GLIB2_LIBS) \ + $(GTK_LIBS) \ + $(LIBXML2_LIBS) \ + $(NULL) +test_version_compare_CFLAGS = \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -DG_LOG_DOMAIN=\"virt-viewer\" \ $(GLIB2_CFLAGS) \ $(GTK_CFLAGS) \ - $(GTK_VNC_CFLAGS) \ $(LIBXML2_CFLAGS) \ + $(WARN_CFLAGS) \ + $(NULL) + +if HAVE_LIBVIRT +bin_PROGRAMS += virt-viewer +virt_viewer_SOURCES = \ + virt-viewer-events.h \ + virt-viewer-events.c \ + virt-viewer.h \ + virt-viewer.c \ + virt-viewer-main.c \ + $(NULL) +virt_viewer_LDFLAGS = \ + $(COMMON_LIBS) \ + $(LIBVIRT_LIBS) \ + $(NULL) +virt_viewer_CFLAGS = \ + $(COMMON_CFLAGS) \ $(LIBVIRT_CFLAGS) \ - $(OVIRT_CFLAGS) \ - $(SPICE_GTK_CFLAGS) \ - $(SPICE_CONTROLLER_CFLAGS) \ - $(WARN_CFLAGS) \ + $(NULL) +virt_viewer_LDADD = \ + libvirt-viewer.la \ $(NULL) endif bin_PROGRAMS += remote-viewer remote_viewer_SOURCES = \ - $(COMMON_SOURCES) \ - remote-viewer.h remote-viewer.c \ + remote-viewer.h \ + remote-viewer.c \ + remote-viewer-connect.c \ + remote-viewer-connect.h \ remote-viewer-main.c \ $(NULL) remote_viewer_LDFLAGS = \ - -lm \ - $(GLIB2_LIBS) \ - $(GTK_LIBS) \ - $(GTK_VNC_LIBS) \ - $(LIBXML2_LIBS) \ - $(OVIRT_LIBS) \ - $(SPICE_GTK_LIBS) \ + $(COMMON_LIBS) \ $(SPICE_CONTROLLER_LIBS) \ $(NULL) remote_viewer_CFLAGS = \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -DG_LOG_DOMAIN=\"remote-viewer\" \ - $(GLIB2_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GTK_VNC_CFLAGS) \ - $(LIBXML2_CFLAGS) \ - $(OVIRT_CFLAGS) \ - $(SPICE_GTK_CFLAGS) \ + $(COMMON_CFLAGS) \ $(SPICE_CONTROLLER_CFLAGS) \ - $(WARN_CFLAGS) \ + $(NULL) +remote_viewer_LDADD = \ + libvirt-viewer.la \ $(NULL) if OS_WIN32 diff --git a/src/Makefile.in b/src/Makefile.in index 5c95aa2..e1cad11 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,8 +15,19 @@ @SET_MAKE@ + VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,23 +92,31 @@ host_triplet = @host@ bin_PROGRAMS = $(am__EXEEXT_1) remote-viewer$(EXEEXT) $(am__EXEEXT_2) @HAVE_GTK_VNC_TRUE@am__append_1 = \ -@HAVE_GTK_VNC_TRUE@ virt-viewer-session-vnc.h virt-viewer-session-vnc.c \ -@HAVE_GTK_VNC_TRUE@ virt-viewer-display-vnc.h virt-viewer-display-vnc.c \ +@HAVE_GTK_VNC_TRUE@ virt-viewer-session-vnc.h \ +@HAVE_GTK_VNC_TRUE@ virt-viewer-session-vnc.c \ +@HAVE_GTK_VNC_TRUE@ virt-viewer-display-vnc.h \ +@HAVE_GTK_VNC_TRUE@ virt-viewer-display-vnc.c \ @HAVE_GTK_VNC_TRUE@ $(NULL) @HAVE_SPICE_GTK_TRUE@am__append_2 = \ -@HAVE_SPICE_GTK_TRUE@ virt-viewer-session-spice.h virt-viewer-session-spice.c \ -@HAVE_SPICE_GTK_TRUE@ virt-viewer-display-spice.h virt-viewer-display-spice.c \ +@HAVE_SPICE_GTK_TRUE@ virt-viewer-session-spice.h \ +@HAVE_SPICE_GTK_TRUE@ virt-viewer-session-spice.c \ +@HAVE_SPICE_GTK_TRUE@ virt-viewer-display-spice.h \ +@HAVE_SPICE_GTK_TRUE@ virt-viewer-display-spice.c \ @HAVE_SPICE_GTK_TRUE@ $(NULL) -@HAVE_LIBVIRT_TRUE@am__append_3 = virt-viewer -@OS_WIN32_TRUE@am__append_4 = -Wl,--subsystem,windows -@OS_WIN32_TRUE@am__append_5 = windows-cmdline-wrapper debug-helper -@OS_WIN32_TRUE@am__append_6 = virt-viewer_rc.$(OBJEXT) +@HAVE_OVIRT_TRUE@am__append_3 = \ +@HAVE_OVIRT_TRUE@ ovirt-foreign-menu.h \ +@HAVE_OVIRT_TRUE@ ovirt-foreign-menu.c \ +@HAVE_OVIRT_TRUE@ $(NULL) + +check_PROGRAMS = test-version-compare$(EXEEXT) +@HAVE_LIBVIRT_TRUE@am__append_4 = virt-viewer +@OS_WIN32_TRUE@am__append_5 = -Wl,--subsystem,windows +@OS_WIN32_TRUE@am__append_6 = windows-cmdline-wrapper debug-helper @OS_WIN32_TRUE@am__append_7 = virt-viewer_rc.$(OBJEXT) +@OS_WIN32_TRUE@am__append_8 = virt-viewer_rc.$(OBJEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/virt-viewer.rc.in $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -106,10 +125,73 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = virt-viewer.rc CONFIG_CLEAN_VPATH_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +libvirt_viewer_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) +am__libvirt_viewer_la_SOURCES_DIST = virt-viewer-enums.h \ + virt-viewer-enums.c virt-glib-compat.h virt-glib-compat.c \ + virt-gtk-compat.h virt-viewer-util.h virt-viewer-util.c \ + virt-viewer-auth.h virt-viewer-auth.c virt-viewer-app.h \ + virt-viewer-app.c virt-viewer-file.h virt-viewer-file.c \ + virt-viewer-session.h virt-viewer-session.c \ + virt-viewer-display.h virt-viewer-display.c \ + virt-viewer-notebook.h virt-viewer-notebook.c \ + virt-viewer-window.h virt-viewer-window.c \ + virt-viewer-vm-connection.h virt-viewer-vm-connection.c \ + view/autoDrawer.c view/autoDrawer.h view/drawer.c \ + view/drawer.h view/ovBox.c view/ovBox.h \ + virt-viewer-session-vnc.h virt-viewer-session-vnc.c \ + virt-viewer-display-vnc.h virt-viewer-display-vnc.c \ + virt-viewer-session-spice.h virt-viewer-session-spice.c \ + virt-viewer-display-spice.h virt-viewer-display-spice.c \ + ovirt-foreign-menu.h ovirt-foreign-menu.c +am__objects_1 = +am__objects_2 = libvirt_viewer_la-virt-viewer-enums.lo \ + $(am__objects_1) +am__dirstamp = $(am__leading_dot)dirstamp +@HAVE_GTK_VNC_TRUE@am__objects_3 = libvirt_viewer_la-virt-viewer-session-vnc.lo \ +@HAVE_GTK_VNC_TRUE@ libvirt_viewer_la-virt-viewer-display-vnc.lo \ +@HAVE_GTK_VNC_TRUE@ $(am__objects_1) +@HAVE_SPICE_GTK_TRUE@am__objects_4 = libvirt_viewer_la-virt-viewer-session-spice.lo \ +@HAVE_SPICE_GTK_TRUE@ libvirt_viewer_la-virt-viewer-display-spice.lo \ +@HAVE_SPICE_GTK_TRUE@ $(am__objects_1) +@HAVE_OVIRT_TRUE@am__objects_5 = \ +@HAVE_OVIRT_TRUE@ libvirt_viewer_la-ovirt-foreign-menu.lo \ +@HAVE_OVIRT_TRUE@ $(am__objects_1) +am_libvirt_viewer_la_OBJECTS = $(am__objects_2) \ + libvirt_viewer_la-virt-glib-compat.lo \ + libvirt_viewer_la-virt-viewer-util.lo \ + libvirt_viewer_la-virt-viewer-auth.lo \ + libvirt_viewer_la-virt-viewer-app.lo \ + libvirt_viewer_la-virt-viewer-file.lo \ + libvirt_viewer_la-virt-viewer-session.lo \ + libvirt_viewer_la-virt-viewer-display.lo \ + libvirt_viewer_la-virt-viewer-notebook.lo \ + libvirt_viewer_la-virt-viewer-window.lo \ + libvirt_viewer_la-virt-viewer-vm-connection.lo \ + view/libvirt_viewer_la-autoDrawer.lo \ + view/libvirt_viewer_la-drawer.lo \ + view/libvirt_viewer_la-ovBox.lo $(am__objects_1) \ + $(am__objects_3) $(am__objects_4) $(am__objects_5) +libvirt_viewer_la_OBJECTS = $(am_libvirt_viewer_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libvirt_viewer_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libvirt_viewer_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ @HAVE_LIBVIRT_TRUE@am__EXEEXT_1 = virt-viewer$(EXEEXT) @OS_WIN32_TRUE@am__EXEEXT_2 = windows-cmdline-wrapper$(EXEEXT) \ @OS_WIN32_TRUE@ debug-helper$(EXEEXT) @@ -120,109 +202,40 @@ @OS_WIN32_TRUE@ debug_helper-debug-helper.$(OBJEXT) debug_helper_OBJECTS = $(am_debug_helper_OBJECTS) debug_helper_LDADD = $(LDADD) -debug_helper_DEPENDENCIES = $(am__append_6) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = +debug_helper_DEPENDENCIES = $(am__append_7) debug_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(debug_helper_CFLAGS) \ $(CFLAGS) $(debug_helper_LDFLAGS) $(LDFLAGS) -o $@ -am__remote_viewer_SOURCES_DIST = virt-viewer-enums.h \ - virt-viewer-enums.c virt-glib-compat.h virt-glib-compat.c \ - virt-gtk-compat.h virt-viewer-util.h virt-viewer-util.c \ - virt-viewer-auth.h virt-viewer-auth.c virt-viewer-app.h \ - virt-viewer-app.c virt-viewer-file.h virt-viewer-file.c \ - virt-viewer-session.h virt-viewer-session.c \ - virt-viewer-display.h virt-viewer-display.c \ - virt-viewer-notebook.h virt-viewer-notebook.c \ - virt-viewer-window.h virt-viewer-window.c view/autoDrawer.c \ - view/autoDrawer.h view/drawer.c view/drawer.h view/ovBox.c \ - view/ovBox.h virt-viewer-session-vnc.h \ - virt-viewer-session-vnc.c virt-viewer-display-vnc.h \ - virt-viewer-display-vnc.c virt-viewer-session-spice.h \ - virt-viewer-session-spice.c virt-viewer-display-spice.h \ - virt-viewer-display-spice.c remote-viewer.h remote-viewer.c \ - remote-viewer-main.c -am__objects_1 = -am__objects_2 = remote_viewer-virt-viewer-enums.$(OBJEXT) \ - $(am__objects_1) -am__dirstamp = $(am__leading_dot)dirstamp -@HAVE_GTK_VNC_TRUE@am__objects_3 = remote_viewer-virt-viewer-session-vnc.$(OBJEXT) \ -@HAVE_GTK_VNC_TRUE@ remote_viewer-virt-viewer-display-vnc.$(OBJEXT) \ -@HAVE_GTK_VNC_TRUE@ $(am__objects_1) -@HAVE_SPICE_GTK_TRUE@am__objects_4 = remote_viewer-virt-viewer-session-spice.$(OBJEXT) \ -@HAVE_SPICE_GTK_TRUE@ remote_viewer-virt-viewer-display-spice.$(OBJEXT) \ -@HAVE_SPICE_GTK_TRUE@ $(am__objects_1) -am__objects_5 = $(am__objects_2) \ - remote_viewer-virt-glib-compat.$(OBJEXT) \ - remote_viewer-virt-viewer-util.$(OBJEXT) \ - remote_viewer-virt-viewer-auth.$(OBJEXT) \ - remote_viewer-virt-viewer-app.$(OBJEXT) \ - remote_viewer-virt-viewer-file.$(OBJEXT) \ - remote_viewer-virt-viewer-session.$(OBJEXT) \ - remote_viewer-virt-viewer-display.$(OBJEXT) \ - remote_viewer-virt-viewer-notebook.$(OBJEXT) \ - remote_viewer-virt-viewer-window.$(OBJEXT) \ - view/remote_viewer-autoDrawer.$(OBJEXT) \ - view/remote_viewer-drawer.$(OBJEXT) \ - view/remote_viewer-ovBox.$(OBJEXT) $(am__objects_1) \ - $(am__objects_3) $(am__objects_4) -am_remote_viewer_OBJECTS = $(am__objects_5) \ - remote_viewer-remote-viewer.$(OBJEXT) \ +am_remote_viewer_OBJECTS = remote_viewer-remote-viewer.$(OBJEXT) \ + remote_viewer-remote-viewer-connect.$(OBJEXT) \ remote_viewer-remote-viewer-main.$(OBJEXT) $(am__objects_1) remote_viewer_OBJECTS = $(am_remote_viewer_OBJECTS) -remote_viewer_LDADD = $(LDADD) -remote_viewer_DEPENDENCIES = $(am__append_6) +remote_viewer_DEPENDENCIES = libvirt-viewer.la $(am__DEPENDENCIES_1) remote_viewer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(remote_viewer_CFLAGS) \ $(CFLAGS) $(remote_viewer_LDFLAGS) $(LDFLAGS) -o $@ -am__virt_viewer_SOURCES_DIST = virt-viewer-enums.h virt-viewer-enums.c \ - virt-glib-compat.h virt-glib-compat.c virt-gtk-compat.h \ - virt-viewer-util.h virt-viewer-util.c virt-viewer-auth.h \ - virt-viewer-auth.c virt-viewer-app.h virt-viewer-app.c \ - virt-viewer-file.h virt-viewer-file.c virt-viewer-session.h \ - virt-viewer-session.c virt-viewer-display.h \ - virt-viewer-display.c virt-viewer-notebook.h \ - virt-viewer-notebook.c virt-viewer-window.h \ - virt-viewer-window.c view/autoDrawer.c view/autoDrawer.h \ - view/drawer.c view/drawer.h view/ovBox.c view/ovBox.h \ - virt-viewer-session-vnc.h virt-viewer-session-vnc.c \ - virt-viewer-display-vnc.h virt-viewer-display-vnc.c \ - virt-viewer-session-spice.h virt-viewer-session-spice.c \ - virt-viewer-display-spice.h virt-viewer-display-spice.c \ - virt-viewer-events.h virt-viewer-events.c virt-viewer.h \ - virt-viewer.c virt-viewer-main.c -am__objects_6 = virt_viewer-virt-viewer-enums.$(OBJEXT) \ +am_test_version_compare_OBJECTS = \ + test_version_compare-virt-viewer-util.$(OBJEXT) \ + test_version_compare-test-version-compare.$(OBJEXT) \ $(am__objects_1) -@HAVE_GTK_VNC_TRUE@am__objects_7 = virt_viewer-virt-viewer-session-vnc.$(OBJEXT) \ -@HAVE_GTK_VNC_TRUE@ virt_viewer-virt-viewer-display-vnc.$(OBJEXT) \ -@HAVE_GTK_VNC_TRUE@ $(am__objects_1) -@HAVE_SPICE_GTK_TRUE@am__objects_8 = virt_viewer-virt-viewer-session-spice.$(OBJEXT) \ -@HAVE_SPICE_GTK_TRUE@ virt_viewer-virt-viewer-display-spice.$(OBJEXT) \ -@HAVE_SPICE_GTK_TRUE@ $(am__objects_1) -am__objects_9 = $(am__objects_6) \ - virt_viewer-virt-glib-compat.$(OBJEXT) \ - virt_viewer-virt-viewer-util.$(OBJEXT) \ - virt_viewer-virt-viewer-auth.$(OBJEXT) \ - virt_viewer-virt-viewer-app.$(OBJEXT) \ - virt_viewer-virt-viewer-file.$(OBJEXT) \ - virt_viewer-virt-viewer-session.$(OBJEXT) \ - virt_viewer-virt-viewer-display.$(OBJEXT) \ - virt_viewer-virt-viewer-notebook.$(OBJEXT) \ - virt_viewer-virt-viewer-window.$(OBJEXT) \ - view/virt_viewer-autoDrawer.$(OBJEXT) \ - view/virt_viewer-drawer.$(OBJEXT) \ - view/virt_viewer-ovBox.$(OBJEXT) $(am__objects_1) \ - $(am__objects_7) $(am__objects_8) -@HAVE_LIBVIRT_TRUE@am_virt_viewer_OBJECTS = $(am__objects_9) \ +test_version_compare_OBJECTS = $(am_test_version_compare_OBJECTS) +test_version_compare_LDADD = $(LDADD) +test_version_compare_DEPENDENCIES = $(am__append_7) +test_version_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_version_compare_CFLAGS) $(CFLAGS) \ + $(test_version_compare_LDFLAGS) $(LDFLAGS) -o $@ +am__virt_viewer_SOURCES_DIST = virt-viewer-events.h \ + virt-viewer-events.c virt-viewer.h virt-viewer.c \ + virt-viewer-main.c +@HAVE_LIBVIRT_TRUE@am_virt_viewer_OBJECTS = \ @HAVE_LIBVIRT_TRUE@ virt_viewer-virt-viewer-events.$(OBJEXT) \ @HAVE_LIBVIRT_TRUE@ virt_viewer-virt-viewer.$(OBJEXT) \ @HAVE_LIBVIRT_TRUE@ virt_viewer-virt-viewer-main.$(OBJEXT) \ @HAVE_LIBVIRT_TRUE@ $(am__objects_1) virt_viewer_OBJECTS = $(am_virt_viewer_OBJECTS) -virt_viewer_LDADD = $(LDADD) -virt_viewer_DEPENDENCIES = $(am__append_6) +@HAVE_LIBVIRT_TRUE@virt_viewer_DEPENDENCIES = libvirt-viewer.la \ +@HAVE_LIBVIRT_TRUE@ $(am__DEPENDENCIES_1) virt_viewer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(virt_viewer_CFLAGS) \ $(CFLAGS) $(virt_viewer_LDFLAGS) $(LDFLAGS) -o $@ @@ -232,7 +245,7 @@ windows_cmdline_wrapper_OBJECTS = \ $(am_windows_cmdline_wrapper_OBJECTS) windows_cmdline_wrapper_LDADD = $(LDADD) -windows_cmdline_wrapper_DEPENDENCIES = $(am__append_6) +windows_cmdline_wrapper_DEPENDENCIES = $(am__append_7) windows_cmdline_wrapper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(windows_cmdline_wrapper_LDFLAGS) \ @@ -271,10 +284,12 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(debug_helper_SOURCES) $(remote_viewer_SOURCES) \ +SOURCES = $(libvirt_viewer_la_SOURCES) $(debug_helper_SOURCES) \ + $(remote_viewer_SOURCES) $(test_version_compare_SOURCES) \ $(virt_viewer_SOURCES) $(windows_cmdline_wrapper_SOURCES) -DIST_SOURCES = $(am__debug_helper_SOURCES_DIST) \ - $(am__remote_viewer_SOURCES_DIST) \ +DIST_SOURCES = $(am__libvirt_viewer_la_SOURCES_DIST) \ + $(am__debug_helper_SOURCES_DIST) $(remote_viewer_SOURCES) \ + $(test_version_compare_SOURCES) \ $(am__virt_viewer_SOURCES_DIST) \ $(am__windows_cmdline_wrapper_SOURCES_DIST) am__can_run_installinfo = \ @@ -329,6 +344,186 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/virt-viewer.rc.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -410,6 +605,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -516,13 +712,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -LDADD = $(am__append_6) -MAINTAINERCLEANFILES = $(am__append_7) +LDADD = $(am__append_7) +MAINTAINERCLEANFILES = $(am__append_8) +noinst_LTLIBRARIES = libvirt-viewer.la builderxmldir = $(pkgdatadir)/ui builderxml_DATA = \ virt-viewer.xml \ virt-viewer-about.xml \ virt-viewer-auth.xml \ + virt-viewer-guest-details.xml \ + virt-viewer-vm-connection.xml \ + virt-viewer-preferences.xml \ + remote-viewer-connect.xml \ $(NULL) EXTRA_DIST = $(builderxml_DATA) virt-viewer-enums.c.etemplate \ @@ -537,68 +738,107 @@ virt-viewer-enums.c \ $(NULL) -COMMON_SOURCES = $(BUILT_SOURCES) virt-glib-compat.h \ +libvirt_viewer_la_SOURCES = $(BUILT_SOURCES) virt-glib-compat.h \ virt-glib-compat.c virt-gtk-compat.h virt-viewer-util.h \ virt-viewer-util.c virt-viewer-auth.h virt-viewer-auth.c \ virt-viewer-app.h virt-viewer-app.c virt-viewer-file.h \ virt-viewer-file.c virt-viewer-session.h virt-viewer-session.c \ virt-viewer-display.h virt-viewer-display.c \ virt-viewer-notebook.h virt-viewer-notebook.c \ - virt-viewer-window.h virt-viewer-window.c view/autoDrawer.c \ - view/autoDrawer.h view/drawer.c view/drawer.h view/ovBox.c \ - view/ovBox.h $(NULL) $(am__append_1) $(am__append_2) + virt-viewer-window.h virt-viewer-window.c \ + virt-viewer-vm-connection.h virt-viewer-vm-connection.c \ + view/autoDrawer.c view/autoDrawer.h view/drawer.c \ + view/drawer.h view/ovBox.c view/ovBox.h $(NULL) \ + $(am__append_1) $(am__append_2) $(am__append_3) +COMMON_LIBS = \ + -lm \ + $(GLIB2_LIBS) \ + $(GTK_LIBS) \ + $(GTK_VNC_LIBS) \ + $(SPICE_GTK_LIBS) \ + $(LIBXML2_LIBS) \ + $(OVIRT_LIBS) \ + $(NULL) + +COMMON_CFLAGS = \ + -DLOCALE_DIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"virt-viewer\" \ + $(GLIB2_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GTK_VNC_CFLAGS) \ + $(SPICE_GTK_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(OVIRT_CFLAGS) \ + $(WARN_CFLAGS) \ + $(NULL) + +libvirt_viewer_la_LIBADD = \ + $(COMMON_LIBS) \ + $(NULL) + +libvirt_viewer_la_CFLAGS = \ + $(COMMON_CFLAGS) + +TESTS = $(check_PROGRAMS) +test_version_compare_SOURCES = \ + virt-viewer-util.c \ + virt-viewer-util.h \ + test-version-compare.c \ + $(NULL) + +test_version_compare_LDFLAGS = \ + $(GLIB2_LIBS) \ + $(GTK_LIBS) \ + $(LIBXML2_LIBS) \ + $(NULL) + +test_version_compare_CFLAGS = \ + -DLOCALE_DIR=\""$(datadir)/locale"\" \ + $(GLIB2_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(WARN_CFLAGS) \ + $(NULL) + @HAVE_LIBVIRT_TRUE@virt_viewer_SOURCES = \ -@HAVE_LIBVIRT_TRUE@ $(COMMON_SOURCES) \ -@HAVE_LIBVIRT_TRUE@ virt-viewer-events.h virt-viewer-events.c \ -@HAVE_LIBVIRT_TRUE@ virt-viewer.h virt-viewer.c \ +@HAVE_LIBVIRT_TRUE@ virt-viewer-events.h \ +@HAVE_LIBVIRT_TRUE@ virt-viewer-events.c \ +@HAVE_LIBVIRT_TRUE@ virt-viewer.h \ +@HAVE_LIBVIRT_TRUE@ virt-viewer.c \ @HAVE_LIBVIRT_TRUE@ virt-viewer-main.c \ @HAVE_LIBVIRT_TRUE@ $(NULL) @HAVE_LIBVIRT_TRUE@virt_viewer_LDFLAGS = \ -@HAVE_LIBVIRT_TRUE@ -lm \ -@HAVE_LIBVIRT_TRUE@ $(GLIB2_LIBS) \ -@HAVE_LIBVIRT_TRUE@ $(GTK_LIBS) \ -@HAVE_LIBVIRT_TRUE@ $(GTK_VNC_LIBS) \ -@HAVE_LIBVIRT_TRUE@ $(LIBXML2_LIBS) \ +@HAVE_LIBVIRT_TRUE@ $(COMMON_LIBS) \ @HAVE_LIBVIRT_TRUE@ $(LIBVIRT_LIBS) \ -@HAVE_LIBVIRT_TRUE@ $(OVIRT_LIBS) \ -@HAVE_LIBVIRT_TRUE@ $(SPICE_GTK_LIBS) \ @HAVE_LIBVIRT_TRUE@ $(NULL) @HAVE_LIBVIRT_TRUE@virt_viewer_CFLAGS = \ -@HAVE_LIBVIRT_TRUE@ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -@HAVE_LIBVIRT_TRUE@ -DG_LOG_DOMAIN=\"virt-viewer\" \ -@HAVE_LIBVIRT_TRUE@ $(GLIB2_CFLAGS) \ -@HAVE_LIBVIRT_TRUE@ $(GTK_CFLAGS) \ -@HAVE_LIBVIRT_TRUE@ $(GTK_VNC_CFLAGS) \ -@HAVE_LIBVIRT_TRUE@ $(LIBXML2_CFLAGS) \ +@HAVE_LIBVIRT_TRUE@ $(COMMON_CFLAGS) \ @HAVE_LIBVIRT_TRUE@ $(LIBVIRT_CFLAGS) \ -@HAVE_LIBVIRT_TRUE@ $(OVIRT_CFLAGS) \ -@HAVE_LIBVIRT_TRUE@ $(SPICE_GTK_CFLAGS) \ -@HAVE_LIBVIRT_TRUE@ $(SPICE_CONTROLLER_CFLAGS) \ -@HAVE_LIBVIRT_TRUE@ $(WARN_CFLAGS) \ @HAVE_LIBVIRT_TRUE@ $(NULL) +@HAVE_LIBVIRT_TRUE@virt_viewer_LDADD = \ +@HAVE_LIBVIRT_TRUE@ libvirt-viewer.la \ +@HAVE_LIBVIRT_TRUE@ $(NULL) + remote_viewer_SOURCES = \ - $(COMMON_SOURCES) \ - remote-viewer.h remote-viewer.c \ + remote-viewer.h \ + remote-viewer.c \ + remote-viewer-connect.c \ + remote-viewer-connect.h \ remote-viewer-main.c \ $(NULL) -remote_viewer_LDFLAGS = -lm $(GLIB2_LIBS) $(GTK_LIBS) $(GTK_VNC_LIBS) \ - $(LIBXML2_LIBS) $(OVIRT_LIBS) $(SPICE_GTK_LIBS) \ - $(SPICE_CONTROLLER_LIBS) $(NULL) $(am__append_4) +remote_viewer_LDFLAGS = $(COMMON_LIBS) $(SPICE_CONTROLLER_LIBS) \ + $(NULL) $(am__append_5) remote_viewer_CFLAGS = \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -DG_LOG_DOMAIN=\"remote-viewer\" \ - $(GLIB2_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GTK_VNC_CFLAGS) \ - $(LIBXML2_CFLAGS) \ - $(OVIRT_CFLAGS) \ - $(SPICE_GTK_CFLAGS) \ + $(COMMON_CFLAGS) \ $(SPICE_CONTROLLER_CFLAGS) \ - $(WARN_CFLAGS) \ + $(NULL) + +remote_viewer_LDADD = \ + libvirt-viewer.la \ $(NULL) AM_CPPFLAGS = -DPACKAGE_DATADIR=\""$(pkgdatadir)"\" @@ -614,7 +854,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -627,7 +867,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -647,6 +886,32 @@ $(am__aclocal_m4_deps): virt-viewer.rc: $(top_builddir)/config.status $(srcdir)/virt-viewer.rc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +view/$(am__dirstamp): + @$(MKDIR_P) view + @: > view/$(am__dirstamp) +view/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) view/$(DEPDIR) + @: > view/$(DEPDIR)/$(am__dirstamp) +view/libvirt_viewer_la-autoDrawer.lo: view/$(am__dirstamp) \ + view/$(DEPDIR)/$(am__dirstamp) +view/libvirt_viewer_la-drawer.lo: view/$(am__dirstamp) \ + view/$(DEPDIR)/$(am__dirstamp) +view/libvirt_viewer_la-ovBox.lo: view/$(am__dirstamp) \ + view/$(DEPDIR)/$(am__dirstamp) + +libvirt-viewer.la: $(libvirt_viewer_la_OBJECTS) $(libvirt_viewer_la_DEPENDENCIES) $(EXTRA_libvirt_viewer_la_DEPENDENCIES) + $(AM_V_CCLD)$(libvirt_viewer_la_LINK) $(libvirt_viewer_la_OBJECTS) $(libvirt_viewer_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -697,31 +962,26 @@ echo " rm -f" $$list; \ rm -f $$list +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + debug-helper$(EXEEXT): $(debug_helper_OBJECTS) $(debug_helper_DEPENDENCIES) $(EXTRA_debug_helper_DEPENDENCIES) @rm -f debug-helper$(EXEEXT) $(AM_V_CCLD)$(debug_helper_LINK) $(debug_helper_OBJECTS) $(debug_helper_LDADD) $(LIBS) -view/$(am__dirstamp): - @$(MKDIR_P) view - @: > view/$(am__dirstamp) -view/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) view/$(DEPDIR) - @: > view/$(DEPDIR)/$(am__dirstamp) -view/remote_viewer-autoDrawer.$(OBJEXT): view/$(am__dirstamp) \ - view/$(DEPDIR)/$(am__dirstamp) -view/remote_viewer-drawer.$(OBJEXT): view/$(am__dirstamp) \ - view/$(DEPDIR)/$(am__dirstamp) -view/remote_viewer-ovBox.$(OBJEXT): view/$(am__dirstamp) \ - view/$(DEPDIR)/$(am__dirstamp) remote-viewer$(EXEEXT): $(remote_viewer_OBJECTS) $(remote_viewer_DEPENDENCIES) $(EXTRA_remote_viewer_DEPENDENCIES) @rm -f remote-viewer$(EXEEXT) $(AM_V_CCLD)$(remote_viewer_LINK) $(remote_viewer_OBJECTS) $(remote_viewer_LDADD) $(LIBS) -view/virt_viewer-autoDrawer.$(OBJEXT): view/$(am__dirstamp) \ - view/$(DEPDIR)/$(am__dirstamp) -view/virt_viewer-drawer.$(OBJEXT): view/$(am__dirstamp) \ - view/$(DEPDIR)/$(am__dirstamp) -view/virt_viewer-ovBox.$(OBJEXT): view/$(am__dirstamp) \ - view/$(DEPDIR)/$(am__dirstamp) + +test-version-compare$(EXEEXT): $(test_version_compare_OBJECTS) $(test_version_compare_DEPENDENCIES) $(EXTRA_test_version_compare_DEPENDENCIES) + @rm -f test-version-compare$(EXEEXT) + $(AM_V_CCLD)$(test_version_compare_LINK) $(test_version_compare_OBJECTS) $(test_version_compare_LDADD) $(LIBS) virt-viewer$(EXEEXT): $(virt_viewer_OBJECTS) $(virt_viewer_DEPENDENCIES) $(EXTRA_virt_viewer_DEPENDENCIES) @rm -f virt-viewer$(EXEEXT) @@ -734,51 +994,40 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) -rm -f view/*.$(OBJEXT) + -rm -f view/*.lo distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug_helper-debug-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-ovirt-foreign-menu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-glib-compat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-app.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-auth.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-display-spice.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-display-vnc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-display.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-enums.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-file.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-notebook.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-session-spice.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-session-vnc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-session.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-vm-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_viewer_la-virt-viewer-window.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-remote-viewer-connect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-remote-viewer-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-remote-viewer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-glib-compat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-app.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-auth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-display-spice.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-display.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-enums.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-file.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-notebook.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-session-spice.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-session.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-window.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-glib-compat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-app.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-auth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-display-spice.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-display.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-enums.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_version_compare-test-version-compare.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_version_compare-virt-viewer-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-events.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-file.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-notebook.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-session-spice.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-session-vnc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-session.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-cmdline-wrapper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/remote_viewer-autoDrawer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/remote_viewer-drawer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/remote_viewer-ovBox.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/virt_viewer-autoDrawer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/virt_viewer-drawer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/virt_viewer-ovBox.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/libvirt_viewer_la-autoDrawer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/libvirt_viewer_la-drawer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@view/$(DEPDIR)/libvirt_viewer_la-ovBox.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -804,6 +1053,139 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libvirt_viewer_la-virt-viewer-enums.lo: virt-viewer-enums.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-enums.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-enums.Tpo -c -o libvirt_viewer_la-virt-viewer-enums.lo `test -f 'virt-viewer-enums.c' || echo '$(srcdir)/'`virt-viewer-enums.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-enums.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-enums.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='libvirt_viewer_la-virt-viewer-enums.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-enums.lo `test -f 'virt-viewer-enums.c' || echo '$(srcdir)/'`virt-viewer-enums.c + +libvirt_viewer_la-virt-glib-compat.lo: virt-glib-compat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-glib-compat.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-glib-compat.Tpo -c -o libvirt_viewer_la-virt-glib-compat.lo `test -f 'virt-glib-compat.c' || echo '$(srcdir)/'`virt-glib-compat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-glib-compat.Tpo $(DEPDIR)/libvirt_viewer_la-virt-glib-compat.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-glib-compat.c' object='libvirt_viewer_la-virt-glib-compat.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-glib-compat.lo `test -f 'virt-glib-compat.c' || echo '$(srcdir)/'`virt-glib-compat.c + +libvirt_viewer_la-virt-viewer-util.lo: virt-viewer-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-util.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-util.Tpo -c -o libvirt_viewer_la-virt-viewer-util.lo `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-util.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-util.c' object='libvirt_viewer_la-virt-viewer-util.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-util.lo `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c + +libvirt_viewer_la-virt-viewer-auth.lo: virt-viewer-auth.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-auth.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-auth.Tpo -c -o libvirt_viewer_la-virt-viewer-auth.lo `test -f 'virt-viewer-auth.c' || echo '$(srcdir)/'`virt-viewer-auth.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-auth.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-auth.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-auth.c' object='libvirt_viewer_la-virt-viewer-auth.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-auth.lo `test -f 'virt-viewer-auth.c' || echo '$(srcdir)/'`virt-viewer-auth.c + +libvirt_viewer_la-virt-viewer-app.lo: virt-viewer-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-app.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-app.Tpo -c -o libvirt_viewer_la-virt-viewer-app.lo `test -f 'virt-viewer-app.c' || echo '$(srcdir)/'`virt-viewer-app.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-app.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-app.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-app.c' object='libvirt_viewer_la-virt-viewer-app.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-app.lo `test -f 'virt-viewer-app.c' || echo '$(srcdir)/'`virt-viewer-app.c + +libvirt_viewer_la-virt-viewer-file.lo: virt-viewer-file.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-file.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-file.Tpo -c -o libvirt_viewer_la-virt-viewer-file.lo `test -f 'virt-viewer-file.c' || echo '$(srcdir)/'`virt-viewer-file.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-file.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-file.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-file.c' object='libvirt_viewer_la-virt-viewer-file.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-file.lo `test -f 'virt-viewer-file.c' || echo '$(srcdir)/'`virt-viewer-file.c + +libvirt_viewer_la-virt-viewer-session.lo: virt-viewer-session.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-session.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-session.Tpo -c -o libvirt_viewer_la-virt-viewer-session.lo `test -f 'virt-viewer-session.c' || echo '$(srcdir)/'`virt-viewer-session.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-session.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-session.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session.c' object='libvirt_viewer_la-virt-viewer-session.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-session.lo `test -f 'virt-viewer-session.c' || echo '$(srcdir)/'`virt-viewer-session.c + +libvirt_viewer_la-virt-viewer-display.lo: virt-viewer-display.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-display.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-display.Tpo -c -o libvirt_viewer_la-virt-viewer-display.lo `test -f 'virt-viewer-display.c' || echo '$(srcdir)/'`virt-viewer-display.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-display.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-display.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display.c' object='libvirt_viewer_la-virt-viewer-display.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-display.lo `test -f 'virt-viewer-display.c' || echo '$(srcdir)/'`virt-viewer-display.c + +libvirt_viewer_la-virt-viewer-notebook.lo: virt-viewer-notebook.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-notebook.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-notebook.Tpo -c -o libvirt_viewer_la-virt-viewer-notebook.lo `test -f 'virt-viewer-notebook.c' || echo '$(srcdir)/'`virt-viewer-notebook.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-notebook.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-notebook.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-notebook.c' object='libvirt_viewer_la-virt-viewer-notebook.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-notebook.lo `test -f 'virt-viewer-notebook.c' || echo '$(srcdir)/'`virt-viewer-notebook.c + +libvirt_viewer_la-virt-viewer-window.lo: virt-viewer-window.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-window.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-window.Tpo -c -o libvirt_viewer_la-virt-viewer-window.lo `test -f 'virt-viewer-window.c' || echo '$(srcdir)/'`virt-viewer-window.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-window.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-window.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-window.c' object='libvirt_viewer_la-virt-viewer-window.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-window.lo `test -f 'virt-viewer-window.c' || echo '$(srcdir)/'`virt-viewer-window.c + +libvirt_viewer_la-virt-viewer-vm-connection.lo: virt-viewer-vm-connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-vm-connection.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-vm-connection.Tpo -c -o libvirt_viewer_la-virt-viewer-vm-connection.lo `test -f 'virt-viewer-vm-connection.c' || echo '$(srcdir)/'`virt-viewer-vm-connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-vm-connection.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-vm-connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-vm-connection.c' object='libvirt_viewer_la-virt-viewer-vm-connection.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-vm-connection.lo `test -f 'virt-viewer-vm-connection.c' || echo '$(srcdir)/'`virt-viewer-vm-connection.c + +view/libvirt_viewer_la-autoDrawer.lo: view/autoDrawer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT view/libvirt_viewer_la-autoDrawer.lo -MD -MP -MF view/$(DEPDIR)/libvirt_viewer_la-autoDrawer.Tpo -c -o view/libvirt_viewer_la-autoDrawer.lo `test -f 'view/autoDrawer.c' || echo '$(srcdir)/'`view/autoDrawer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/libvirt_viewer_la-autoDrawer.Tpo view/$(DEPDIR)/libvirt_viewer_la-autoDrawer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/autoDrawer.c' object='view/libvirt_viewer_la-autoDrawer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o view/libvirt_viewer_la-autoDrawer.lo `test -f 'view/autoDrawer.c' || echo '$(srcdir)/'`view/autoDrawer.c + +view/libvirt_viewer_la-drawer.lo: view/drawer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT view/libvirt_viewer_la-drawer.lo -MD -MP -MF view/$(DEPDIR)/libvirt_viewer_la-drawer.Tpo -c -o view/libvirt_viewer_la-drawer.lo `test -f 'view/drawer.c' || echo '$(srcdir)/'`view/drawer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/libvirt_viewer_la-drawer.Tpo view/$(DEPDIR)/libvirt_viewer_la-drawer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/drawer.c' object='view/libvirt_viewer_la-drawer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o view/libvirt_viewer_la-drawer.lo `test -f 'view/drawer.c' || echo '$(srcdir)/'`view/drawer.c + +view/libvirt_viewer_la-ovBox.lo: view/ovBox.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT view/libvirt_viewer_la-ovBox.lo -MD -MP -MF view/$(DEPDIR)/libvirt_viewer_la-ovBox.Tpo -c -o view/libvirt_viewer_la-ovBox.lo `test -f 'view/ovBox.c' || echo '$(srcdir)/'`view/ovBox.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/libvirt_viewer_la-ovBox.Tpo view/$(DEPDIR)/libvirt_viewer_la-ovBox.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/ovBox.c' object='view/libvirt_viewer_la-ovBox.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o view/libvirt_viewer_la-ovBox.lo `test -f 'view/ovBox.c' || echo '$(srcdir)/'`view/ovBox.c + +libvirt_viewer_la-virt-viewer-session-vnc.lo: virt-viewer-session-vnc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-session-vnc.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-session-vnc.Tpo -c -o libvirt_viewer_la-virt-viewer-session-vnc.lo `test -f 'virt-viewer-session-vnc.c' || echo '$(srcdir)/'`virt-viewer-session-vnc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-session-vnc.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-session-vnc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-vnc.c' object='libvirt_viewer_la-virt-viewer-session-vnc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-session-vnc.lo `test -f 'virt-viewer-session-vnc.c' || echo '$(srcdir)/'`virt-viewer-session-vnc.c + +libvirt_viewer_la-virt-viewer-display-vnc.lo: virt-viewer-display-vnc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-display-vnc.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-display-vnc.Tpo -c -o libvirt_viewer_la-virt-viewer-display-vnc.lo `test -f 'virt-viewer-display-vnc.c' || echo '$(srcdir)/'`virt-viewer-display-vnc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-display-vnc.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-display-vnc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-vnc.c' object='libvirt_viewer_la-virt-viewer-display-vnc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-display-vnc.lo `test -f 'virt-viewer-display-vnc.c' || echo '$(srcdir)/'`virt-viewer-display-vnc.c + +libvirt_viewer_la-virt-viewer-session-spice.lo: virt-viewer-session-spice.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-session-spice.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-session-spice.Tpo -c -o libvirt_viewer_la-virt-viewer-session-spice.lo `test -f 'virt-viewer-session-spice.c' || echo '$(srcdir)/'`virt-viewer-session-spice.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-session-spice.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-session-spice.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-spice.c' object='libvirt_viewer_la-virt-viewer-session-spice.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-session-spice.lo `test -f 'virt-viewer-session-spice.c' || echo '$(srcdir)/'`virt-viewer-session-spice.c + +libvirt_viewer_la-virt-viewer-display-spice.lo: virt-viewer-display-spice.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-virt-viewer-display-spice.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-virt-viewer-display-spice.Tpo -c -o libvirt_viewer_la-virt-viewer-display-spice.lo `test -f 'virt-viewer-display-spice.c' || echo '$(srcdir)/'`virt-viewer-display-spice.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-virt-viewer-display-spice.Tpo $(DEPDIR)/libvirt_viewer_la-virt-viewer-display-spice.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-spice.c' object='libvirt_viewer_la-virt-viewer-display-spice.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-virt-viewer-display-spice.lo `test -f 'virt-viewer-display-spice.c' || echo '$(srcdir)/'`virt-viewer-display-spice.c + +libvirt_viewer_la-ovirt-foreign-menu.lo: ovirt-foreign-menu.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -MT libvirt_viewer_la-ovirt-foreign-menu.lo -MD -MP -MF $(DEPDIR)/libvirt_viewer_la-ovirt-foreign-menu.Tpo -c -o libvirt_viewer_la-ovirt-foreign-menu.lo `test -f 'ovirt-foreign-menu.c' || echo '$(srcdir)/'`ovirt-foreign-menu.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_viewer_la-ovirt-foreign-menu.Tpo $(DEPDIR)/libvirt_viewer_la-ovirt-foreign-menu.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ovirt-foreign-menu.c' object='libvirt_viewer_la-ovirt-foreign-menu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_viewer_la_CFLAGS) $(CFLAGS) -c -o libvirt_viewer_la-ovirt-foreign-menu.lo `test -f 'ovirt-foreign-menu.c' || echo '$(srcdir)/'`ovirt-foreign-menu.c + debug_helper-debug-helper.o: debug-helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(debug_helper_CFLAGS) $(CFLAGS) -MT debug_helper-debug-helper.o -MD -MP -MF $(DEPDIR)/debug_helper-debug-helper.Tpo -c -o debug_helper-debug-helper.o `test -f 'debug-helper.c' || echo '$(srcdir)/'`debug-helper.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/debug_helper-debug-helper.Tpo $(DEPDIR)/debug_helper-debug-helper.Po @@ -818,244 +1200,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(debug_helper_CFLAGS) $(CFLAGS) -c -o debug_helper-debug-helper.obj `if test -f 'debug-helper.c'; then $(CYGPATH_W) 'debug-helper.c'; else $(CYGPATH_W) '$(srcdir)/debug-helper.c'; fi` -remote_viewer-virt-viewer-enums.o: virt-viewer-enums.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-enums.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo -c -o remote_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' || echo '$(srcdir)/'`virt-viewer-enums.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo $(DEPDIR)/remote_viewer-virt-viewer-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='remote_viewer-virt-viewer-enums.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' || echo '$(srcdir)/'`virt-viewer-enums.c - -remote_viewer-virt-viewer-enums.obj: virt-viewer-enums.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-enums.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo -c -o remote_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo $(DEPDIR)/remote_viewer-virt-viewer-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='remote_viewer-virt-viewer-enums.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi` - -remote_viewer-virt-glib-compat.o: virt-glib-compat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-glib-compat.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-glib-compat.Tpo -c -o remote_viewer-virt-glib-compat.o `test -f 'virt-glib-compat.c' || echo '$(srcdir)/'`virt-glib-compat.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-glib-compat.Tpo $(DEPDIR)/remote_viewer-virt-glib-compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-glib-compat.c' object='remote_viewer-virt-glib-compat.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-glib-compat.o `test -f 'virt-glib-compat.c' || echo '$(srcdir)/'`virt-glib-compat.c - -remote_viewer-virt-glib-compat.obj: virt-glib-compat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-glib-compat.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-glib-compat.Tpo -c -o remote_viewer-virt-glib-compat.obj `if test -f 'virt-glib-compat.c'; then $(CYGPATH_W) 'virt-glib-compat.c'; else $(CYGPATH_W) '$(srcdir)/virt-glib-compat.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-glib-compat.Tpo $(DEPDIR)/remote_viewer-virt-glib-compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-glib-compat.c' object='remote_viewer-virt-glib-compat.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-glib-compat.obj `if test -f 'virt-glib-compat.c'; then $(CYGPATH_W) 'virt-glib-compat.c'; else $(CYGPATH_W) '$(srcdir)/virt-glib-compat.c'; fi` - -remote_viewer-virt-viewer-util.o: virt-viewer-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-util.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-util.Tpo -c -o remote_viewer-virt-viewer-util.o `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-util.Tpo $(DEPDIR)/remote_viewer-virt-viewer-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-util.c' object='remote_viewer-virt-viewer-util.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-util.o `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c - -remote_viewer-virt-viewer-util.obj: virt-viewer-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-util.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-util.Tpo -c -o remote_viewer-virt-viewer-util.obj `if test -f 'virt-viewer-util.c'; then $(CYGPATH_W) 'virt-viewer-util.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-util.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-util.Tpo $(DEPDIR)/remote_viewer-virt-viewer-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-util.c' object='remote_viewer-virt-viewer-util.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-util.obj `if test -f 'virt-viewer-util.c'; then $(CYGPATH_W) 'virt-viewer-util.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-util.c'; fi` - -remote_viewer-virt-viewer-auth.o: virt-viewer-auth.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-auth.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-auth.Tpo -c -o remote_viewer-virt-viewer-auth.o `test -f 'virt-viewer-auth.c' || echo '$(srcdir)/'`virt-viewer-auth.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-auth.Tpo $(DEPDIR)/remote_viewer-virt-viewer-auth.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-auth.c' object='remote_viewer-virt-viewer-auth.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-auth.o `test -f 'virt-viewer-auth.c' || echo '$(srcdir)/'`virt-viewer-auth.c - -remote_viewer-virt-viewer-auth.obj: virt-viewer-auth.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-auth.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-auth.Tpo -c -o remote_viewer-virt-viewer-auth.obj `if test -f 'virt-viewer-auth.c'; then $(CYGPATH_W) 'virt-viewer-auth.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-auth.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-auth.Tpo $(DEPDIR)/remote_viewer-virt-viewer-auth.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-auth.c' object='remote_viewer-virt-viewer-auth.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-auth.obj `if test -f 'virt-viewer-auth.c'; then $(CYGPATH_W) 'virt-viewer-auth.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-auth.c'; fi` - -remote_viewer-virt-viewer-app.o: virt-viewer-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-app.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-app.Tpo -c -o remote_viewer-virt-viewer-app.o `test -f 'virt-viewer-app.c' || echo '$(srcdir)/'`virt-viewer-app.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-app.Tpo $(DEPDIR)/remote_viewer-virt-viewer-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-app.c' object='remote_viewer-virt-viewer-app.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-app.o `test -f 'virt-viewer-app.c' || echo '$(srcdir)/'`virt-viewer-app.c - -remote_viewer-virt-viewer-app.obj: virt-viewer-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-app.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-app.Tpo -c -o remote_viewer-virt-viewer-app.obj `if test -f 'virt-viewer-app.c'; then $(CYGPATH_W) 'virt-viewer-app.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-app.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-app.Tpo $(DEPDIR)/remote_viewer-virt-viewer-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-app.c' object='remote_viewer-virt-viewer-app.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-app.obj `if test -f 'virt-viewer-app.c'; then $(CYGPATH_W) 'virt-viewer-app.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-app.c'; fi` - -remote_viewer-virt-viewer-file.o: virt-viewer-file.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-file.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-file.Tpo -c -o remote_viewer-virt-viewer-file.o `test -f 'virt-viewer-file.c' || echo '$(srcdir)/'`virt-viewer-file.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-file.Tpo $(DEPDIR)/remote_viewer-virt-viewer-file.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-file.c' object='remote_viewer-virt-viewer-file.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-file.o `test -f 'virt-viewer-file.c' || echo '$(srcdir)/'`virt-viewer-file.c - -remote_viewer-virt-viewer-file.obj: virt-viewer-file.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-file.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-file.Tpo -c -o remote_viewer-virt-viewer-file.obj `if test -f 'virt-viewer-file.c'; then $(CYGPATH_W) 'virt-viewer-file.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-file.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-file.Tpo $(DEPDIR)/remote_viewer-virt-viewer-file.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-file.c' object='remote_viewer-virt-viewer-file.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-file.obj `if test -f 'virt-viewer-file.c'; then $(CYGPATH_W) 'virt-viewer-file.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-file.c'; fi` - -remote_viewer-virt-viewer-session.o: virt-viewer-session.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-session.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-session.Tpo -c -o remote_viewer-virt-viewer-session.o `test -f 'virt-viewer-session.c' || echo '$(srcdir)/'`virt-viewer-session.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-session.Tpo $(DEPDIR)/remote_viewer-virt-viewer-session.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session.c' object='remote_viewer-virt-viewer-session.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-session.o `test -f 'virt-viewer-session.c' || echo '$(srcdir)/'`virt-viewer-session.c - -remote_viewer-virt-viewer-session.obj: virt-viewer-session.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-session.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-session.Tpo -c -o remote_viewer-virt-viewer-session.obj `if test -f 'virt-viewer-session.c'; then $(CYGPATH_W) 'virt-viewer-session.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-session.Tpo $(DEPDIR)/remote_viewer-virt-viewer-session.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session.c' object='remote_viewer-virt-viewer-session.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-session.obj `if test -f 'virt-viewer-session.c'; then $(CYGPATH_W) 'virt-viewer-session.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session.c'; fi` - -remote_viewer-virt-viewer-display.o: virt-viewer-display.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-display.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-display.Tpo -c -o remote_viewer-virt-viewer-display.o `test -f 'virt-viewer-display.c' || echo '$(srcdir)/'`virt-viewer-display.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-display.Tpo $(DEPDIR)/remote_viewer-virt-viewer-display.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display.c' object='remote_viewer-virt-viewer-display.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-display.o `test -f 'virt-viewer-display.c' || echo '$(srcdir)/'`virt-viewer-display.c - -remote_viewer-virt-viewer-display.obj: virt-viewer-display.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-display.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-display.Tpo -c -o remote_viewer-virt-viewer-display.obj `if test -f 'virt-viewer-display.c'; then $(CYGPATH_W) 'virt-viewer-display.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-display.Tpo $(DEPDIR)/remote_viewer-virt-viewer-display.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display.c' object='remote_viewer-virt-viewer-display.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-display.obj `if test -f 'virt-viewer-display.c'; then $(CYGPATH_W) 'virt-viewer-display.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display.c'; fi` - -remote_viewer-virt-viewer-notebook.o: virt-viewer-notebook.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-notebook.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-notebook.Tpo -c -o remote_viewer-virt-viewer-notebook.o `test -f 'virt-viewer-notebook.c' || echo '$(srcdir)/'`virt-viewer-notebook.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-notebook.Tpo $(DEPDIR)/remote_viewer-virt-viewer-notebook.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-notebook.c' object='remote_viewer-virt-viewer-notebook.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-notebook.o `test -f 'virt-viewer-notebook.c' || echo '$(srcdir)/'`virt-viewer-notebook.c - -remote_viewer-virt-viewer-notebook.obj: virt-viewer-notebook.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-notebook.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-notebook.Tpo -c -o remote_viewer-virt-viewer-notebook.obj `if test -f 'virt-viewer-notebook.c'; then $(CYGPATH_W) 'virt-viewer-notebook.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-notebook.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-notebook.Tpo $(DEPDIR)/remote_viewer-virt-viewer-notebook.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-notebook.c' object='remote_viewer-virt-viewer-notebook.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-notebook.obj `if test -f 'virt-viewer-notebook.c'; then $(CYGPATH_W) 'virt-viewer-notebook.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-notebook.c'; fi` - -remote_viewer-virt-viewer-window.o: virt-viewer-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-window.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-window.Tpo -c -o remote_viewer-virt-viewer-window.o `test -f 'virt-viewer-window.c' || echo '$(srcdir)/'`virt-viewer-window.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-window.Tpo $(DEPDIR)/remote_viewer-virt-viewer-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-window.c' object='remote_viewer-virt-viewer-window.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-window.o `test -f 'virt-viewer-window.c' || echo '$(srcdir)/'`virt-viewer-window.c - -remote_viewer-virt-viewer-window.obj: virt-viewer-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-window.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-window.Tpo -c -o remote_viewer-virt-viewer-window.obj `if test -f 'virt-viewer-window.c'; then $(CYGPATH_W) 'virt-viewer-window.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-window.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-window.Tpo $(DEPDIR)/remote_viewer-virt-viewer-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-window.c' object='remote_viewer-virt-viewer-window.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-window.obj `if test -f 'virt-viewer-window.c'; then $(CYGPATH_W) 'virt-viewer-window.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-window.c'; fi` - -view/remote_viewer-autoDrawer.o: view/autoDrawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT view/remote_viewer-autoDrawer.o -MD -MP -MF view/$(DEPDIR)/remote_viewer-autoDrawer.Tpo -c -o view/remote_viewer-autoDrawer.o `test -f 'view/autoDrawer.c' || echo '$(srcdir)/'`view/autoDrawer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/remote_viewer-autoDrawer.Tpo view/$(DEPDIR)/remote_viewer-autoDrawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/autoDrawer.c' object='view/remote_viewer-autoDrawer.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o view/remote_viewer-autoDrawer.o `test -f 'view/autoDrawer.c' || echo '$(srcdir)/'`view/autoDrawer.c - -view/remote_viewer-autoDrawer.obj: view/autoDrawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT view/remote_viewer-autoDrawer.obj -MD -MP -MF view/$(DEPDIR)/remote_viewer-autoDrawer.Tpo -c -o view/remote_viewer-autoDrawer.obj `if test -f 'view/autoDrawer.c'; then $(CYGPATH_W) 'view/autoDrawer.c'; else $(CYGPATH_W) '$(srcdir)/view/autoDrawer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/remote_viewer-autoDrawer.Tpo view/$(DEPDIR)/remote_viewer-autoDrawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/autoDrawer.c' object='view/remote_viewer-autoDrawer.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o view/remote_viewer-autoDrawer.obj `if test -f 'view/autoDrawer.c'; then $(CYGPATH_W) 'view/autoDrawer.c'; else $(CYGPATH_W) '$(srcdir)/view/autoDrawer.c'; fi` - -view/remote_viewer-drawer.o: view/drawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT view/remote_viewer-drawer.o -MD -MP -MF view/$(DEPDIR)/remote_viewer-drawer.Tpo -c -o view/remote_viewer-drawer.o `test -f 'view/drawer.c' || echo '$(srcdir)/'`view/drawer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/remote_viewer-drawer.Tpo view/$(DEPDIR)/remote_viewer-drawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/drawer.c' object='view/remote_viewer-drawer.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o view/remote_viewer-drawer.o `test -f 'view/drawer.c' || echo '$(srcdir)/'`view/drawer.c - -view/remote_viewer-drawer.obj: view/drawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT view/remote_viewer-drawer.obj -MD -MP -MF view/$(DEPDIR)/remote_viewer-drawer.Tpo -c -o view/remote_viewer-drawer.obj `if test -f 'view/drawer.c'; then $(CYGPATH_W) 'view/drawer.c'; else $(CYGPATH_W) '$(srcdir)/view/drawer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/remote_viewer-drawer.Tpo view/$(DEPDIR)/remote_viewer-drawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/drawer.c' object='view/remote_viewer-drawer.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o view/remote_viewer-drawer.obj `if test -f 'view/drawer.c'; then $(CYGPATH_W) 'view/drawer.c'; else $(CYGPATH_W) '$(srcdir)/view/drawer.c'; fi` - -view/remote_viewer-ovBox.o: view/ovBox.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT view/remote_viewer-ovBox.o -MD -MP -MF view/$(DEPDIR)/remote_viewer-ovBox.Tpo -c -o view/remote_viewer-ovBox.o `test -f 'view/ovBox.c' || echo '$(srcdir)/'`view/ovBox.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/remote_viewer-ovBox.Tpo view/$(DEPDIR)/remote_viewer-ovBox.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/ovBox.c' object='view/remote_viewer-ovBox.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o view/remote_viewer-ovBox.o `test -f 'view/ovBox.c' || echo '$(srcdir)/'`view/ovBox.c - -view/remote_viewer-ovBox.obj: view/ovBox.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT view/remote_viewer-ovBox.obj -MD -MP -MF view/$(DEPDIR)/remote_viewer-ovBox.Tpo -c -o view/remote_viewer-ovBox.obj `if test -f 'view/ovBox.c'; then $(CYGPATH_W) 'view/ovBox.c'; else $(CYGPATH_W) '$(srcdir)/view/ovBox.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/remote_viewer-ovBox.Tpo view/$(DEPDIR)/remote_viewer-ovBox.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/ovBox.c' object='view/remote_viewer-ovBox.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o view/remote_viewer-ovBox.obj `if test -f 'view/ovBox.c'; then $(CYGPATH_W) 'view/ovBox.c'; else $(CYGPATH_W) '$(srcdir)/view/ovBox.c'; fi` - -remote_viewer-virt-viewer-session-vnc.o: virt-viewer-session-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-session-vnc.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Tpo -c -o remote_viewer-virt-viewer-session-vnc.o `test -f 'virt-viewer-session-vnc.c' || echo '$(srcdir)/'`virt-viewer-session-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Tpo $(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-vnc.c' object='remote_viewer-virt-viewer-session-vnc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-session-vnc.o `test -f 'virt-viewer-session-vnc.c' || echo '$(srcdir)/'`virt-viewer-session-vnc.c - -remote_viewer-virt-viewer-session-vnc.obj: virt-viewer-session-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-session-vnc.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Tpo -c -o remote_viewer-virt-viewer-session-vnc.obj `if test -f 'virt-viewer-session-vnc.c'; then $(CYGPATH_W) 'virt-viewer-session-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-vnc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Tpo $(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-vnc.c' object='remote_viewer-virt-viewer-session-vnc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-session-vnc.obj `if test -f 'virt-viewer-session-vnc.c'; then $(CYGPATH_W) 'virt-viewer-session-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-vnc.c'; fi` - -remote_viewer-virt-viewer-display-vnc.o: virt-viewer-display-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-display-vnc.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Tpo -c -o remote_viewer-virt-viewer-display-vnc.o `test -f 'virt-viewer-display-vnc.c' || echo '$(srcdir)/'`virt-viewer-display-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Tpo $(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-vnc.c' object='remote_viewer-virt-viewer-display-vnc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-display-vnc.o `test -f 'virt-viewer-display-vnc.c' || echo '$(srcdir)/'`virt-viewer-display-vnc.c - -remote_viewer-virt-viewer-display-vnc.obj: virt-viewer-display-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-display-vnc.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Tpo -c -o remote_viewer-virt-viewer-display-vnc.obj `if test -f 'virt-viewer-display-vnc.c'; then $(CYGPATH_W) 'virt-viewer-display-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-vnc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Tpo $(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-vnc.c' object='remote_viewer-virt-viewer-display-vnc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-display-vnc.obj `if test -f 'virt-viewer-display-vnc.c'; then $(CYGPATH_W) 'virt-viewer-display-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-vnc.c'; fi` - -remote_viewer-virt-viewer-session-spice.o: virt-viewer-session-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-session-spice.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-session-spice.Tpo -c -o remote_viewer-virt-viewer-session-spice.o `test -f 'virt-viewer-session-spice.c' || echo '$(srcdir)/'`virt-viewer-session-spice.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-session-spice.Tpo $(DEPDIR)/remote_viewer-virt-viewer-session-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-spice.c' object='remote_viewer-virt-viewer-session-spice.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-session-spice.o `test -f 'virt-viewer-session-spice.c' || echo '$(srcdir)/'`virt-viewer-session-spice.c - -remote_viewer-virt-viewer-session-spice.obj: virt-viewer-session-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-session-spice.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-session-spice.Tpo -c -o remote_viewer-virt-viewer-session-spice.obj `if test -f 'virt-viewer-session-spice.c'; then $(CYGPATH_W) 'virt-viewer-session-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-spice.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-session-spice.Tpo $(DEPDIR)/remote_viewer-virt-viewer-session-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-spice.c' object='remote_viewer-virt-viewer-session-spice.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-session-spice.obj `if test -f 'virt-viewer-session-spice.c'; then $(CYGPATH_W) 'virt-viewer-session-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-spice.c'; fi` - -remote_viewer-virt-viewer-display-spice.o: virt-viewer-display-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-display-spice.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-display-spice.Tpo -c -o remote_viewer-virt-viewer-display-spice.o `test -f 'virt-viewer-display-spice.c' || echo '$(srcdir)/'`virt-viewer-display-spice.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-display-spice.Tpo $(DEPDIR)/remote_viewer-virt-viewer-display-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-spice.c' object='remote_viewer-virt-viewer-display-spice.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-display-spice.o `test -f 'virt-viewer-display-spice.c' || echo '$(srcdir)/'`virt-viewer-display-spice.c - -remote_viewer-virt-viewer-display-spice.obj: virt-viewer-display-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-display-spice.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-display-spice.Tpo -c -o remote_viewer-virt-viewer-display-spice.obj `if test -f 'virt-viewer-display-spice.c'; then $(CYGPATH_W) 'virt-viewer-display-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-spice.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-display-spice.Tpo $(DEPDIR)/remote_viewer-virt-viewer-display-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-spice.c' object='remote_viewer-virt-viewer-display-spice.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-display-spice.obj `if test -f 'virt-viewer-display-spice.c'; then $(CYGPATH_W) 'virt-viewer-display-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-spice.c'; fi` - remote_viewer-remote-viewer.o: remote-viewer.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-remote-viewer.o -MD -MP -MF $(DEPDIR)/remote_viewer-remote-viewer.Tpo -c -o remote_viewer-remote-viewer.o `test -f 'remote-viewer.c' || echo '$(srcdir)/'`remote-viewer.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-remote-viewer.Tpo $(DEPDIR)/remote_viewer-remote-viewer.Po @@ -1070,6 +1214,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-remote-viewer.obj `if test -f 'remote-viewer.c'; then $(CYGPATH_W) 'remote-viewer.c'; else $(CYGPATH_W) '$(srcdir)/remote-viewer.c'; fi` +remote_viewer-remote-viewer-connect.o: remote-viewer-connect.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-remote-viewer-connect.o -MD -MP -MF $(DEPDIR)/remote_viewer-remote-viewer-connect.Tpo -c -o remote_viewer-remote-viewer-connect.o `test -f 'remote-viewer-connect.c' || echo '$(srcdir)/'`remote-viewer-connect.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-remote-viewer-connect.Tpo $(DEPDIR)/remote_viewer-remote-viewer-connect.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='remote-viewer-connect.c' object='remote_viewer-remote-viewer-connect.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-remote-viewer-connect.o `test -f 'remote-viewer-connect.c' || echo '$(srcdir)/'`remote-viewer-connect.c + +remote_viewer-remote-viewer-connect.obj: remote-viewer-connect.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-remote-viewer-connect.obj -MD -MP -MF $(DEPDIR)/remote_viewer-remote-viewer-connect.Tpo -c -o remote_viewer-remote-viewer-connect.obj `if test -f 'remote-viewer-connect.c'; then $(CYGPATH_W) 'remote-viewer-connect.c'; else $(CYGPATH_W) '$(srcdir)/remote-viewer-connect.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-remote-viewer-connect.Tpo $(DEPDIR)/remote_viewer-remote-viewer-connect.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='remote-viewer-connect.c' object='remote_viewer-remote-viewer-connect.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-remote-viewer-connect.obj `if test -f 'remote-viewer-connect.c'; then $(CYGPATH_W) 'remote-viewer-connect.c'; else $(CYGPATH_W) '$(srcdir)/remote-viewer-connect.c'; fi` + remote_viewer-remote-viewer-main.o: remote-viewer-main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-remote-viewer-main.o -MD -MP -MF $(DEPDIR)/remote_viewer-remote-viewer-main.Tpo -c -o remote_viewer-remote-viewer-main.o `test -f 'remote-viewer-main.c' || echo '$(srcdir)/'`remote-viewer-main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-remote-viewer-main.Tpo $(DEPDIR)/remote_viewer-remote-viewer-main.Po @@ -1084,243 +1242,33 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-remote-viewer-main.obj `if test -f 'remote-viewer-main.c'; then $(CYGPATH_W) 'remote-viewer-main.c'; else $(CYGPATH_W) '$(srcdir)/remote-viewer-main.c'; fi` -virt_viewer-virt-viewer-enums.o: virt-viewer-enums.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-enums.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo -c -o virt_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' || echo '$(srcdir)/'`virt-viewer-enums.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo $(DEPDIR)/virt_viewer-virt-viewer-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='virt_viewer-virt-viewer-enums.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' || echo '$(srcdir)/'`virt-viewer-enums.c - -virt_viewer-virt-viewer-enums.obj: virt-viewer-enums.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-enums.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo -c -o virt_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo $(DEPDIR)/virt_viewer-virt-viewer-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='virt_viewer-virt-viewer-enums.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi` - -virt_viewer-virt-glib-compat.o: virt-glib-compat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-glib-compat.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-glib-compat.Tpo -c -o virt_viewer-virt-glib-compat.o `test -f 'virt-glib-compat.c' || echo '$(srcdir)/'`virt-glib-compat.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-glib-compat.Tpo $(DEPDIR)/virt_viewer-virt-glib-compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-glib-compat.c' object='virt_viewer-virt-glib-compat.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-glib-compat.o `test -f 'virt-glib-compat.c' || echo '$(srcdir)/'`virt-glib-compat.c - -virt_viewer-virt-glib-compat.obj: virt-glib-compat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-glib-compat.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-glib-compat.Tpo -c -o virt_viewer-virt-glib-compat.obj `if test -f 'virt-glib-compat.c'; then $(CYGPATH_W) 'virt-glib-compat.c'; else $(CYGPATH_W) '$(srcdir)/virt-glib-compat.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-glib-compat.Tpo $(DEPDIR)/virt_viewer-virt-glib-compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-glib-compat.c' object='virt_viewer-virt-glib-compat.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-glib-compat.obj `if test -f 'virt-glib-compat.c'; then $(CYGPATH_W) 'virt-glib-compat.c'; else $(CYGPATH_W) '$(srcdir)/virt-glib-compat.c'; fi` - -virt_viewer-virt-viewer-util.o: virt-viewer-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-util.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-util.Tpo -c -o virt_viewer-virt-viewer-util.o `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-util.Tpo $(DEPDIR)/virt_viewer-virt-viewer-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-util.c' object='virt_viewer-virt-viewer-util.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-util.o `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c - -virt_viewer-virt-viewer-util.obj: virt-viewer-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-util.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-util.Tpo -c -o virt_viewer-virt-viewer-util.obj `if test -f 'virt-viewer-util.c'; then $(CYGPATH_W) 'virt-viewer-util.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-util.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-util.Tpo $(DEPDIR)/virt_viewer-virt-viewer-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-util.c' object='virt_viewer-virt-viewer-util.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-util.obj `if test -f 'virt-viewer-util.c'; then $(CYGPATH_W) 'virt-viewer-util.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-util.c'; fi` - -virt_viewer-virt-viewer-auth.o: virt-viewer-auth.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-auth.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-auth.Tpo -c -o virt_viewer-virt-viewer-auth.o `test -f 'virt-viewer-auth.c' || echo '$(srcdir)/'`virt-viewer-auth.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-auth.Tpo $(DEPDIR)/virt_viewer-virt-viewer-auth.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-auth.c' object='virt_viewer-virt-viewer-auth.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-auth.o `test -f 'virt-viewer-auth.c' || echo '$(srcdir)/'`virt-viewer-auth.c - -virt_viewer-virt-viewer-auth.obj: virt-viewer-auth.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-auth.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-auth.Tpo -c -o virt_viewer-virt-viewer-auth.obj `if test -f 'virt-viewer-auth.c'; then $(CYGPATH_W) 'virt-viewer-auth.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-auth.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-auth.Tpo $(DEPDIR)/virt_viewer-virt-viewer-auth.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-auth.c' object='virt_viewer-virt-viewer-auth.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-auth.obj `if test -f 'virt-viewer-auth.c'; then $(CYGPATH_W) 'virt-viewer-auth.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-auth.c'; fi` - -virt_viewer-virt-viewer-app.o: virt-viewer-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-app.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-app.Tpo -c -o virt_viewer-virt-viewer-app.o `test -f 'virt-viewer-app.c' || echo '$(srcdir)/'`virt-viewer-app.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-app.Tpo $(DEPDIR)/virt_viewer-virt-viewer-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-app.c' object='virt_viewer-virt-viewer-app.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-app.o `test -f 'virt-viewer-app.c' || echo '$(srcdir)/'`virt-viewer-app.c - -virt_viewer-virt-viewer-app.obj: virt-viewer-app.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-app.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-app.Tpo -c -o virt_viewer-virt-viewer-app.obj `if test -f 'virt-viewer-app.c'; then $(CYGPATH_W) 'virt-viewer-app.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-app.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-app.Tpo $(DEPDIR)/virt_viewer-virt-viewer-app.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-app.c' object='virt_viewer-virt-viewer-app.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-app.obj `if test -f 'virt-viewer-app.c'; then $(CYGPATH_W) 'virt-viewer-app.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-app.c'; fi` - -virt_viewer-virt-viewer-file.o: virt-viewer-file.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-file.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-file.Tpo -c -o virt_viewer-virt-viewer-file.o `test -f 'virt-viewer-file.c' || echo '$(srcdir)/'`virt-viewer-file.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-file.Tpo $(DEPDIR)/virt_viewer-virt-viewer-file.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-file.c' object='virt_viewer-virt-viewer-file.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-file.o `test -f 'virt-viewer-file.c' || echo '$(srcdir)/'`virt-viewer-file.c - -virt_viewer-virt-viewer-file.obj: virt-viewer-file.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-file.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-file.Tpo -c -o virt_viewer-virt-viewer-file.obj `if test -f 'virt-viewer-file.c'; then $(CYGPATH_W) 'virt-viewer-file.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-file.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-file.Tpo $(DEPDIR)/virt_viewer-virt-viewer-file.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-file.c' object='virt_viewer-virt-viewer-file.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-file.obj `if test -f 'virt-viewer-file.c'; then $(CYGPATH_W) 'virt-viewer-file.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-file.c'; fi` - -virt_viewer-virt-viewer-session.o: virt-viewer-session.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-session.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-session.Tpo -c -o virt_viewer-virt-viewer-session.o `test -f 'virt-viewer-session.c' || echo '$(srcdir)/'`virt-viewer-session.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-session.Tpo $(DEPDIR)/virt_viewer-virt-viewer-session.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session.c' object='virt_viewer-virt-viewer-session.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-session.o `test -f 'virt-viewer-session.c' || echo '$(srcdir)/'`virt-viewer-session.c - -virt_viewer-virt-viewer-session.obj: virt-viewer-session.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-session.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-session.Tpo -c -o virt_viewer-virt-viewer-session.obj `if test -f 'virt-viewer-session.c'; then $(CYGPATH_W) 'virt-viewer-session.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-session.Tpo $(DEPDIR)/virt_viewer-virt-viewer-session.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session.c' object='virt_viewer-virt-viewer-session.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-session.obj `if test -f 'virt-viewer-session.c'; then $(CYGPATH_W) 'virt-viewer-session.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session.c'; fi` - -virt_viewer-virt-viewer-display.o: virt-viewer-display.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-display.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-display.Tpo -c -o virt_viewer-virt-viewer-display.o `test -f 'virt-viewer-display.c' || echo '$(srcdir)/'`virt-viewer-display.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-display.Tpo $(DEPDIR)/virt_viewer-virt-viewer-display.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display.c' object='virt_viewer-virt-viewer-display.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-display.o `test -f 'virt-viewer-display.c' || echo '$(srcdir)/'`virt-viewer-display.c - -virt_viewer-virt-viewer-display.obj: virt-viewer-display.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-display.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-display.Tpo -c -o virt_viewer-virt-viewer-display.obj `if test -f 'virt-viewer-display.c'; then $(CYGPATH_W) 'virt-viewer-display.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-display.Tpo $(DEPDIR)/virt_viewer-virt-viewer-display.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display.c' object='virt_viewer-virt-viewer-display.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-display.obj `if test -f 'virt-viewer-display.c'; then $(CYGPATH_W) 'virt-viewer-display.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display.c'; fi` - -virt_viewer-virt-viewer-notebook.o: virt-viewer-notebook.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-notebook.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-notebook.Tpo -c -o virt_viewer-virt-viewer-notebook.o `test -f 'virt-viewer-notebook.c' || echo '$(srcdir)/'`virt-viewer-notebook.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-notebook.Tpo $(DEPDIR)/virt_viewer-virt-viewer-notebook.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-notebook.c' object='virt_viewer-virt-viewer-notebook.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-notebook.o `test -f 'virt-viewer-notebook.c' || echo '$(srcdir)/'`virt-viewer-notebook.c - -virt_viewer-virt-viewer-notebook.obj: virt-viewer-notebook.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-notebook.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-notebook.Tpo -c -o virt_viewer-virt-viewer-notebook.obj `if test -f 'virt-viewer-notebook.c'; then $(CYGPATH_W) 'virt-viewer-notebook.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-notebook.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-notebook.Tpo $(DEPDIR)/virt_viewer-virt-viewer-notebook.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-notebook.c' object='virt_viewer-virt-viewer-notebook.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-notebook.obj `if test -f 'virt-viewer-notebook.c'; then $(CYGPATH_W) 'virt-viewer-notebook.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-notebook.c'; fi` - -virt_viewer-virt-viewer-window.o: virt-viewer-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-window.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-window.Tpo -c -o virt_viewer-virt-viewer-window.o `test -f 'virt-viewer-window.c' || echo '$(srcdir)/'`virt-viewer-window.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-window.Tpo $(DEPDIR)/virt_viewer-virt-viewer-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-window.c' object='virt_viewer-virt-viewer-window.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-window.o `test -f 'virt-viewer-window.c' || echo '$(srcdir)/'`virt-viewer-window.c - -virt_viewer-virt-viewer-window.obj: virt-viewer-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-window.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-window.Tpo -c -o virt_viewer-virt-viewer-window.obj `if test -f 'virt-viewer-window.c'; then $(CYGPATH_W) 'virt-viewer-window.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-window.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-window.Tpo $(DEPDIR)/virt_viewer-virt-viewer-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-window.c' object='virt_viewer-virt-viewer-window.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-window.obj `if test -f 'virt-viewer-window.c'; then $(CYGPATH_W) 'virt-viewer-window.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-window.c'; fi` - -view/virt_viewer-autoDrawer.o: view/autoDrawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT view/virt_viewer-autoDrawer.o -MD -MP -MF view/$(DEPDIR)/virt_viewer-autoDrawer.Tpo -c -o view/virt_viewer-autoDrawer.o `test -f 'view/autoDrawer.c' || echo '$(srcdir)/'`view/autoDrawer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/virt_viewer-autoDrawer.Tpo view/$(DEPDIR)/virt_viewer-autoDrawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/autoDrawer.c' object='view/virt_viewer-autoDrawer.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o view/virt_viewer-autoDrawer.o `test -f 'view/autoDrawer.c' || echo '$(srcdir)/'`view/autoDrawer.c - -view/virt_viewer-autoDrawer.obj: view/autoDrawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT view/virt_viewer-autoDrawer.obj -MD -MP -MF view/$(DEPDIR)/virt_viewer-autoDrawer.Tpo -c -o view/virt_viewer-autoDrawer.obj `if test -f 'view/autoDrawer.c'; then $(CYGPATH_W) 'view/autoDrawer.c'; else $(CYGPATH_W) '$(srcdir)/view/autoDrawer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/virt_viewer-autoDrawer.Tpo view/$(DEPDIR)/virt_viewer-autoDrawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/autoDrawer.c' object='view/virt_viewer-autoDrawer.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o view/virt_viewer-autoDrawer.obj `if test -f 'view/autoDrawer.c'; then $(CYGPATH_W) 'view/autoDrawer.c'; else $(CYGPATH_W) '$(srcdir)/view/autoDrawer.c'; fi` - -view/virt_viewer-drawer.o: view/drawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT view/virt_viewer-drawer.o -MD -MP -MF view/$(DEPDIR)/virt_viewer-drawer.Tpo -c -o view/virt_viewer-drawer.o `test -f 'view/drawer.c' || echo '$(srcdir)/'`view/drawer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/virt_viewer-drawer.Tpo view/$(DEPDIR)/virt_viewer-drawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/drawer.c' object='view/virt_viewer-drawer.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o view/virt_viewer-drawer.o `test -f 'view/drawer.c' || echo '$(srcdir)/'`view/drawer.c - -view/virt_viewer-drawer.obj: view/drawer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT view/virt_viewer-drawer.obj -MD -MP -MF view/$(DEPDIR)/virt_viewer-drawer.Tpo -c -o view/virt_viewer-drawer.obj `if test -f 'view/drawer.c'; then $(CYGPATH_W) 'view/drawer.c'; else $(CYGPATH_W) '$(srcdir)/view/drawer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/virt_viewer-drawer.Tpo view/$(DEPDIR)/virt_viewer-drawer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/drawer.c' object='view/virt_viewer-drawer.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o view/virt_viewer-drawer.obj `if test -f 'view/drawer.c'; then $(CYGPATH_W) 'view/drawer.c'; else $(CYGPATH_W) '$(srcdir)/view/drawer.c'; fi` - -view/virt_viewer-ovBox.o: view/ovBox.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT view/virt_viewer-ovBox.o -MD -MP -MF view/$(DEPDIR)/virt_viewer-ovBox.Tpo -c -o view/virt_viewer-ovBox.o `test -f 'view/ovBox.c' || echo '$(srcdir)/'`view/ovBox.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/virt_viewer-ovBox.Tpo view/$(DEPDIR)/virt_viewer-ovBox.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/ovBox.c' object='view/virt_viewer-ovBox.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o view/virt_viewer-ovBox.o `test -f 'view/ovBox.c' || echo '$(srcdir)/'`view/ovBox.c - -view/virt_viewer-ovBox.obj: view/ovBox.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT view/virt_viewer-ovBox.obj -MD -MP -MF view/$(DEPDIR)/virt_viewer-ovBox.Tpo -c -o view/virt_viewer-ovBox.obj `if test -f 'view/ovBox.c'; then $(CYGPATH_W) 'view/ovBox.c'; else $(CYGPATH_W) '$(srcdir)/view/ovBox.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) view/$(DEPDIR)/virt_viewer-ovBox.Tpo view/$(DEPDIR)/virt_viewer-ovBox.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='view/ovBox.c' object='view/virt_viewer-ovBox.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o view/virt_viewer-ovBox.obj `if test -f 'view/ovBox.c'; then $(CYGPATH_W) 'view/ovBox.c'; else $(CYGPATH_W) '$(srcdir)/view/ovBox.c'; fi` - -virt_viewer-virt-viewer-session-vnc.o: virt-viewer-session-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-session-vnc.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-session-vnc.Tpo -c -o virt_viewer-virt-viewer-session-vnc.o `test -f 'virt-viewer-session-vnc.c' || echo '$(srcdir)/'`virt-viewer-session-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-session-vnc.Tpo $(DEPDIR)/virt_viewer-virt-viewer-session-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-vnc.c' object='virt_viewer-virt-viewer-session-vnc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-session-vnc.o `test -f 'virt-viewer-session-vnc.c' || echo '$(srcdir)/'`virt-viewer-session-vnc.c - -virt_viewer-virt-viewer-session-vnc.obj: virt-viewer-session-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-session-vnc.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-session-vnc.Tpo -c -o virt_viewer-virt-viewer-session-vnc.obj `if test -f 'virt-viewer-session-vnc.c'; then $(CYGPATH_W) 'virt-viewer-session-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-vnc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-session-vnc.Tpo $(DEPDIR)/virt_viewer-virt-viewer-session-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-vnc.c' object='virt_viewer-virt-viewer-session-vnc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-session-vnc.obj `if test -f 'virt-viewer-session-vnc.c'; then $(CYGPATH_W) 'virt-viewer-session-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-vnc.c'; fi` - -virt_viewer-virt-viewer-display-vnc.o: virt-viewer-display-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-display-vnc.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Tpo -c -o virt_viewer-virt-viewer-display-vnc.o `test -f 'virt-viewer-display-vnc.c' || echo '$(srcdir)/'`virt-viewer-display-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Tpo $(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-vnc.c' object='virt_viewer-virt-viewer-display-vnc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-display-vnc.o `test -f 'virt-viewer-display-vnc.c' || echo '$(srcdir)/'`virt-viewer-display-vnc.c - -virt_viewer-virt-viewer-display-vnc.obj: virt-viewer-display-vnc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-display-vnc.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Tpo -c -o virt_viewer-virt-viewer-display-vnc.obj `if test -f 'virt-viewer-display-vnc.c'; then $(CYGPATH_W) 'virt-viewer-display-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-vnc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Tpo $(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-vnc.c' object='virt_viewer-virt-viewer-display-vnc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-display-vnc.obj `if test -f 'virt-viewer-display-vnc.c'; then $(CYGPATH_W) 'virt-viewer-display-vnc.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-vnc.c'; fi` - -virt_viewer-virt-viewer-session-spice.o: virt-viewer-session-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-session-spice.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-session-spice.Tpo -c -o virt_viewer-virt-viewer-session-spice.o `test -f 'virt-viewer-session-spice.c' || echo '$(srcdir)/'`virt-viewer-session-spice.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-session-spice.Tpo $(DEPDIR)/virt_viewer-virt-viewer-session-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-spice.c' object='virt_viewer-virt-viewer-session-spice.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-session-spice.o `test -f 'virt-viewer-session-spice.c' || echo '$(srcdir)/'`virt-viewer-session-spice.c - -virt_viewer-virt-viewer-session-spice.obj: virt-viewer-session-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-session-spice.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-session-spice.Tpo -c -o virt_viewer-virt-viewer-session-spice.obj `if test -f 'virt-viewer-session-spice.c'; then $(CYGPATH_W) 'virt-viewer-session-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-spice.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-session-spice.Tpo $(DEPDIR)/virt_viewer-virt-viewer-session-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-session-spice.c' object='virt_viewer-virt-viewer-session-spice.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-session-spice.obj `if test -f 'virt-viewer-session-spice.c'; then $(CYGPATH_W) 'virt-viewer-session-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-session-spice.c'; fi` - -virt_viewer-virt-viewer-display-spice.o: virt-viewer-display-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-display-spice.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-display-spice.Tpo -c -o virt_viewer-virt-viewer-display-spice.o `test -f 'virt-viewer-display-spice.c' || echo '$(srcdir)/'`virt-viewer-display-spice.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-display-spice.Tpo $(DEPDIR)/virt_viewer-virt-viewer-display-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-spice.c' object='virt_viewer-virt-viewer-display-spice.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-display-spice.o `test -f 'virt-viewer-display-spice.c' || echo '$(srcdir)/'`virt-viewer-display-spice.c - -virt_viewer-virt-viewer-display-spice.obj: virt-viewer-display-spice.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-display-spice.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-display-spice.Tpo -c -o virt_viewer-virt-viewer-display-spice.obj `if test -f 'virt-viewer-display-spice.c'; then $(CYGPATH_W) 'virt-viewer-display-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-spice.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-display-spice.Tpo $(DEPDIR)/virt_viewer-virt-viewer-display-spice.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-display-spice.c' object='virt_viewer-virt-viewer-display-spice.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-display-spice.obj `if test -f 'virt-viewer-display-spice.c'; then $(CYGPATH_W) 'virt-viewer-display-spice.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-display-spice.c'; fi` +test_version_compare-virt-viewer-util.o: virt-viewer-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -MT test_version_compare-virt-viewer-util.o -MD -MP -MF $(DEPDIR)/test_version_compare-virt-viewer-util.Tpo -c -o test_version_compare-virt-viewer-util.o `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_version_compare-virt-viewer-util.Tpo $(DEPDIR)/test_version_compare-virt-viewer-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-util.c' object='test_version_compare-virt-viewer-util.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -c -o test_version_compare-virt-viewer-util.o `test -f 'virt-viewer-util.c' || echo '$(srcdir)/'`virt-viewer-util.c + +test_version_compare-virt-viewer-util.obj: virt-viewer-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -MT test_version_compare-virt-viewer-util.obj -MD -MP -MF $(DEPDIR)/test_version_compare-virt-viewer-util.Tpo -c -o test_version_compare-virt-viewer-util.obj `if test -f 'virt-viewer-util.c'; then $(CYGPATH_W) 'virt-viewer-util.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-util.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_version_compare-virt-viewer-util.Tpo $(DEPDIR)/test_version_compare-virt-viewer-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-util.c' object='test_version_compare-virt-viewer-util.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -c -o test_version_compare-virt-viewer-util.obj `if test -f 'virt-viewer-util.c'; then $(CYGPATH_W) 'virt-viewer-util.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-util.c'; fi` + +test_version_compare-test-version-compare.o: test-version-compare.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -MT test_version_compare-test-version-compare.o -MD -MP -MF $(DEPDIR)/test_version_compare-test-version-compare.Tpo -c -o test_version_compare-test-version-compare.o `test -f 'test-version-compare.c' || echo '$(srcdir)/'`test-version-compare.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_version_compare-test-version-compare.Tpo $(DEPDIR)/test_version_compare-test-version-compare.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-version-compare.c' object='test_version_compare-test-version-compare.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -c -o test_version_compare-test-version-compare.o `test -f 'test-version-compare.c' || echo '$(srcdir)/'`test-version-compare.c + +test_version_compare-test-version-compare.obj: test-version-compare.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -MT test_version_compare-test-version-compare.obj -MD -MP -MF $(DEPDIR)/test_version_compare-test-version-compare.Tpo -c -o test_version_compare-test-version-compare.obj `if test -f 'test-version-compare.c'; then $(CYGPATH_W) 'test-version-compare.c'; else $(CYGPATH_W) '$(srcdir)/test-version-compare.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_version_compare-test-version-compare.Tpo $(DEPDIR)/test_version_compare-test-version-compare.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-version-compare.c' object='test_version_compare-test-version-compare.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_version_compare_CFLAGS) $(CFLAGS) -c -o test_version_compare-test-version-compare.obj `if test -f 'test-version-compare.c'; then $(CYGPATH_W) 'test-version-compare.c'; else $(CYGPATH_W) '$(srcdir)/test-version-compare.c'; fi` virt_viewer-virt-viewer-events.o: virt-viewer-events.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-events.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-events.Tpo -c -o virt_viewer-virt-viewer-events.o `test -f 'virt-viewer-events.c' || echo '$(srcdir)/'`virt-viewer-events.c @@ -1369,6 +1317,7 @@ clean-libtool: -rm -rf .libs _libs + -rm -rf view/.libs view/_libs install-builderxmlDATA: $(builderxml_DATA) @$(NORMAL_INSTALL) @list='$(builderxml_DATA)'; test -n "$(builderxmldir)" || list=; \ @@ -1442,6 +1391,169 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-version-compare.log: test-version-compare$(EXEEXT) + @p='test-version-compare$(EXEEXT)'; \ + b='test-version-compare'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1474,9 +1586,11 @@ fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) $(DATA) +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(builderxmldir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -1502,6 +1616,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -1518,7 +1635,8 @@ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) view/$(DEPDIR) @@ -1586,11 +1704,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-builderxmlDATA -.MAKE: all check install install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ +.MAKE: all check check-am install install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-builderxmlDATA install-data install-data-am \ @@ -1600,14 +1719,18 @@ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-builderxmlDATA + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-builderxmlDATA + +.PRECIOUS: Makefile $(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES) $(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | \ sed -e 's/VIRT_TYPE_VIEWER/VIRT_VIEWER_TYPE/' \ -e 's,#include "$(srcdir)/,#include ",' > $@ + $(NULL) @OS_WIN32_TRUE@virt-viewer_rc.$(OBJEXT): $(VIRT_VIEWER_RES) $(ICONDIR)/virt-viewer.ico @OS_WIN32_TRUE@ $(AM_V_GEN)$(WINDRES) \ diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c new file mode 100644 index 0000000..9b6d3b8 --- /dev/null +++ b/src/ovirt-foreign-menu.c @@ -0,0 +1,874 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2007-2014 Red Hat, Inc. + * Copyright (C) 2009-2012 Daniel P. Berrange + * Copyright (C) 2010 Marc-André Lureau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange + * Christope Fergeau + */ + +#include + +#include + +#include "ovirt-foreign-menu.h" +#include "virt-glib-compat.h" +#include "virt-viewer-util.h" + +typedef enum { + STATE_0, + STATE_API, + STATE_VM, + STATE_STORAGE_DOMAIN, + STATE_VM_CDROM, + STATE_CDROM_FILE, + STATE_ISOS +} OvirtForeignMenuState; + +static void ovirt_foreign_menu_next_async_step(OvirtForeignMenu *menu, OvirtForeignMenuState state); +static void ovirt_foreign_menu_fetch_api_async(OvirtForeignMenu *menu); +static void ovirt_foreign_menu_fetch_vm_async(OvirtForeignMenu *menu); +static void ovirt_foreign_menu_fetch_storage_domain_async(OvirtForeignMenu *menu); +static void ovirt_foreign_menu_fetch_vm_cdrom_async(OvirtForeignMenu *menu); +static void ovirt_foreign_menu_refresh_cdrom_file_async(OvirtForeignMenu *menu); +static gboolean ovirt_foreign_menu_refresh_iso_list(gpointer user_data); + +G_DEFINE_TYPE (OvirtForeignMenu, ovirt_foreign_menu, G_TYPE_OBJECT) + + +struct _OvirtForeignMenuPrivate { + OvirtProxy *proxy; + OvirtApi *api; + OvirtVm *vm; + char *vm_guid; + + OvirtCollection *files; + OvirtCdrom *cdrom; + + /* The next 2 members are used when changing the ISO image shown in + * a VM */ + /* Name of the ISO which is currently used by the VM OvirtCdrom */ + char *current_iso_name; + /* Name of the ISO we are trying to insert in the VM OvirtCdrom */ + char *next_iso_name; + + GList *iso_names; +}; + + +#define OVIRT_FOREIGN_MENU_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), OVIRT_TYPE_FOREIGN_MENU, OvirtForeignMenuPrivate)) + + +enum { + PROP_0, + PROP_PROXY, + PROP_API, + PROP_VM, + PROP_FILE, + PROP_FILES, + PROP_VM_GUID, +}; + + +static char * +ovirt_foreign_menu_get_current_iso_name(OvirtForeignMenu *foreign_menu) +{ + char *name; + + if (foreign_menu->priv->cdrom == NULL) { + return NULL; + } + + g_object_get(foreign_menu->priv->cdrom, "file", &name, NULL); + + return name; +} + + +static void +ovirt_foreign_menu_get_property(GObject *object, guint property_id, + GValue *value, GParamSpec *pspec) +{ + OvirtForeignMenu *self = OVIRT_FOREIGN_MENU(object); + OvirtForeignMenuPrivate *priv = self->priv; + + switch (property_id) { + case PROP_PROXY: + g_value_set_object(value, priv->proxy); + break; + case PROP_API: + g_value_set_object(value, priv->api); + break; + case PROP_VM: + g_value_set_object(value, priv->vm); + break; + case PROP_FILE: + g_value_take_string(value, + ovirt_foreign_menu_get_current_iso_name(self)); + break; + case PROP_FILES: + g_value_set_pointer(value, priv->iso_names); + break; + case PROP_VM_GUID: + g_value_set_string(value, priv->vm_guid); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + + +static void +ovirt_foreign_menu_set_property(GObject *object, guint property_id, + const GValue *value G_GNUC_UNUSED, GParamSpec *pspec) +{ + OvirtForeignMenu *self = OVIRT_FOREIGN_MENU(object); + OvirtForeignMenuPrivate *priv = self->priv; + + switch (property_id) { + case PROP_PROXY: + if (priv->proxy != NULL) { + g_object_unref(priv->proxy); + } + priv->proxy = g_value_dup_object(value); + break; + case PROP_API: + if (priv->api != NULL) { + g_object_unref(priv->api); + } + priv->api = g_value_dup_object(value); + break; + case PROP_VM: + if (priv->vm != NULL) { + g_object_unref(priv->vm); + } + priv->vm = g_value_dup_object(value); + g_free(priv->vm_guid); + priv->vm_guid = NULL; + if (priv->vm != NULL) { + g_object_get(G_OBJECT(priv->vm), "guid", &priv->vm_guid, NULL); + } + break; + case PROP_VM_GUID: + if (priv->vm != NULL) { + g_object_unref(priv->vm); + priv->vm = NULL; + } + g_free(priv->vm_guid); + priv->vm_guid = g_value_dup_string(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + + +static void +ovirt_foreign_menu_dispose(GObject *obj) +{ + OvirtForeignMenu *self = OVIRT_FOREIGN_MENU(obj); + + if (self->priv->proxy) { + g_object_unref(self->priv->proxy); + self->priv->proxy = NULL; + } + + if (self->priv->api != NULL) { + g_object_unref(self->priv->api); + self->priv->api = NULL; + } + + if (self->priv->vm) { + g_object_unref(self->priv->vm); + self->priv->vm = NULL; + } + + g_free(self->priv->vm_guid); + self->priv->vm_guid = NULL; + + if (self->priv->files) { + g_object_unref(self->priv->files); + self->priv->files = NULL; + } + + if (self->priv->cdrom) { + g_object_unref(self->priv->cdrom); + self->priv->cdrom = NULL; + } + + if (self->priv->iso_names) { + g_list_free_full(self->priv->iso_names, (GDestroyNotify)g_free); + self->priv->iso_names = NULL; + } + + g_free(self->priv->current_iso_name); + self->priv->current_iso_name = NULL; + + g_free(self->priv->next_iso_name); + self->priv->next_iso_name = NULL; + + G_OBJECT_CLASS(ovirt_foreign_menu_parent_class)->dispose(obj); +} + + +static void +ovirt_foreign_menu_class_init(OvirtForeignMenuClass *klass) +{ + GObjectClass *oclass = G_OBJECT_CLASS(klass); + + oclass->get_property = ovirt_foreign_menu_get_property; + oclass->set_property = ovirt_foreign_menu_set_property; + oclass->dispose = ovirt_foreign_menu_dispose; + + g_type_class_add_private(klass, sizeof(OvirtForeignMenuPrivate)); + + g_object_class_install_property(oclass, + PROP_PROXY, + g_param_spec_object("proxy", + "OvirtProxy instance", + "OvirtProxy instance", + OVIRT_TYPE_PROXY, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(oclass, + PROP_API, + g_param_spec_object("api", + "OvirtApi instance", + "Ovirt api root", + OVIRT_TYPE_API, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(oclass, + PROP_VM, + g_param_spec_object("vm", + "OvirtVm instance", + "OvirtVm being handled", + OVIRT_TYPE_VM, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(oclass, + PROP_FILE, + g_param_spec_string("file", + "File", + "Name of the image currently inserted in the virtual CDROM", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(oclass, + PROP_FILES, + g_param_spec_pointer("files", + "ISO names", + "GSList of ISO names for this oVirt VM", + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(oclass, + PROP_VM_GUID, + g_param_spec_string("vm-guid", + "VM GUID", + "GUID of the virtual machine to provide a foreign menu for", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); +} + + +static void +ovirt_foreign_menu_init(OvirtForeignMenu *self) +{ + self->priv = OVIRT_FOREIGN_MENU_GET_PRIVATE(self); +} + + +OvirtForeignMenu* ovirt_foreign_menu_new(OvirtProxy *proxy) +{ + return g_object_new(OVIRT_TYPE_FOREIGN_MENU, + "proxy", proxy, + NULL); +} + + +static void +ovirt_foreign_menu_next_async_step(OvirtForeignMenu *menu, + OvirtForeignMenuState current_state) +{ + g_return_if_fail(current_state >= STATE_0); + g_return_if_fail(current_state < STATE_ISOS); + + current_state++; + + if (current_state == STATE_API) { + if (menu->priv->api == NULL) { + ovirt_foreign_menu_fetch_api_async(menu); + } else { + current_state++; + } + } + + if (current_state == STATE_VM) { + if (menu->priv->vm == NULL) { + ovirt_foreign_menu_fetch_vm_async(menu); + } else { + current_state++; + } + } + + if (current_state == STATE_STORAGE_DOMAIN) { + if (menu->priv->files == NULL) { + ovirt_foreign_menu_fetch_storage_domain_async(menu); + } else { + current_state++; + } + } + + if (current_state == STATE_VM_CDROM) { + if (menu->priv->cdrom == NULL) { + ovirt_foreign_menu_fetch_vm_cdrom_async(menu); + } else { + current_state++; + } + } + + if (current_state == STATE_CDROM_FILE) { + ovirt_foreign_menu_refresh_cdrom_file_async(menu); + } + + if (current_state == STATE_ISOS) { + g_warn_if_fail(menu->priv->api != NULL); + g_warn_if_fail(menu->priv->vm != NULL); + g_warn_if_fail(menu->priv->files != NULL); + g_warn_if_fail(menu->priv->cdrom != NULL); + + ovirt_foreign_menu_refresh_iso_list(menu); + } +} + + +void +ovirt_foreign_menu_start(OvirtForeignMenu *menu) +{ + ovirt_foreign_menu_next_async_step(menu, STATE_0); +} + + +static void +ovirt_foreign_menu_activate_item_cb(GtkMenuItem *menuitem, gpointer user_data); + + +static void +menu_item_set_active_no_signal(GtkMenuItem *menuitem, + gboolean active, + GCallback callback, + gpointer user_data) +{ + g_signal_handlers_block_by_func(menuitem, callback, user_data); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); + g_signal_handlers_unblock_by_func(menuitem, callback, user_data); +} + + +static void updated_cdrom_cb(GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + OvirtForeignMenu *foreign_menu; + gboolean updated; + + foreign_menu = OVIRT_FOREIGN_MENU(user_data); + updated = ovirt_cdrom_update_finish(OVIRT_CDROM(source_object), + result, &error); + g_debug("Finished updating cdrom content"); + if (updated) { + g_free(foreign_menu->priv->current_iso_name); + foreign_menu->priv->current_iso_name = foreign_menu->priv->next_iso_name; + foreign_menu->priv->next_iso_name = NULL; + g_object_notify(G_OBJECT(foreign_menu), "file"); + } else { + /* Reset old state back as we were not successful in switching to + * the new ISO */ + const char *current_file = foreign_menu->priv->current_iso_name; + + if (error != NULL) { + g_warning("failed to update cdrom resource: %s", error->message); + g_clear_error(&error); + } + g_debug("setting OvirtCdrom:file back to '%s'", + current_file?current_file:NULL); + g_object_set(foreign_menu->priv->cdrom, "file", current_file, NULL); + } + g_free(foreign_menu->priv->next_iso_name); + foreign_menu->priv->next_iso_name = NULL; +} + + +static void +ovirt_foreign_menu_activate_item_cb(GtkMenuItem *menuitem, gpointer user_data) +{ + OvirtForeignMenu *foreign_menu; + const char *iso_name; + gboolean checked; + + checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)); + foreign_menu = OVIRT_FOREIGN_MENU(user_data); + g_return_if_fail(foreign_menu->priv->cdrom != NULL); + g_return_if_fail(foreign_menu->priv->next_iso_name == NULL); + + g_debug("'%s' clicked", gtk_menu_item_get_label(menuitem)); + + /* We only want to move the check mark for the currently selected ISO + * when ovirt_cdrom_update_async() is successful, so for now we move + * the check mark back to where it was before + */ + menu_item_set_active_no_signal(menuitem, !checked, + (GCallback)ovirt_foreign_menu_activate_item_cb, + foreign_menu); + + if (checked) { + iso_name = gtk_menu_item_get_label(menuitem); + g_debug("Updating VM cdrom image to '%s'", iso_name); + foreign_menu->priv->next_iso_name = g_strdup(iso_name); + } else { + g_debug("Removing current cdrom image"); + iso_name = NULL; + foreign_menu->priv->next_iso_name = NULL; + } + g_object_set(foreign_menu->priv->cdrom, + "file", iso_name, + NULL); + ovirt_cdrom_update_async(foreign_menu->priv->cdrom, TRUE, + foreign_menu->priv->proxy, NULL, + updated_cdrom_cb, foreign_menu); +} + + +GtkWidget *ovirt_foreign_menu_get_gtk_menu(OvirtForeignMenu *foreign_menu) +{ + GtkWidget *gtk_menu; + GList *it; + char *current_iso; + + g_debug("Creating GtkMenu for foreign menu"); + if (foreign_menu->priv->iso_names == NULL) { + return NULL; + } + current_iso = ovirt_foreign_menu_get_current_iso_name(foreign_menu); + gtk_menu = gtk_menu_new(); + for (it = foreign_menu->priv->iso_names; it != NULL; it = it->next) { + GtkWidget *menuitem; + + menuitem = gtk_check_menu_item_new_with_label((char *)it->data); + if (g_strcmp0((char *)it->data, current_iso) == 0) { + g_warn_if_fail(g_strcmp0(current_iso, foreign_menu->priv->current_iso_name) == 0); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), + TRUE); + } + g_signal_connect(menuitem, "activate", + G_CALLBACK(ovirt_foreign_menu_activate_item_cb), + foreign_menu); + gtk_menu_shell_append(GTK_MENU_SHELL(gtk_menu), menuitem); + } + g_free(current_iso); + + return gtk_menu; +} + + +static void ovirt_foreign_menu_set_files(OvirtForeignMenu *menu, + const GList *files) +{ + GList *sorted_files = NULL; + const GList *it; + GList *it2; + + for (it = files; it != NULL; it = it->next) { + char *name; + g_object_get(it->data, "name", &name, NULL); + /* The oVirt REST API is supposed to have a 'type' node + * associated with file resources , but as of 3.2, this node + * is not present, so we do an extension check instead + * to differentiate between ISOs and floppy images */ + if (g_str_has_suffix(name, ".vfd")) { + g_free(name); + continue; + } + sorted_files = g_list_insert_sorted(sorted_files, name, + (GCompareFunc)g_strcmp0); + } + + for (it = sorted_files, it2 = menu->priv->iso_names; + (it != NULL) && (it2 != NULL); + it = it->next, it2 = it2->next) { + if (g_strcmp0(it->data, it2->data) != 0) { + break; + } + } + + if ((it == NULL) && (it2 == NULL)) { + /* sorted_files and menu->priv->files content was the same */ + g_list_free_full(sorted_files, (GDestroyNotify)g_free); + return; + } + + g_list_free_full(menu->priv->iso_names, (GDestroyNotify)g_free); + menu->priv->iso_names = sorted_files; + g_object_notify(G_OBJECT(menu), "files"); +} + + +static void cdrom_file_refreshed_cb(GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + OvirtResource *cdrom = OVIRT_RESOURCE(source_object); + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(user_data); + GError *error = NULL; + + ovirt_resource_refresh_finish(cdrom, result, &error); + if (error != NULL) { + g_warning("failed to refresh cdrom content: %s", error->message); + g_clear_error(&error); + return; + } + + /* Content of OvirtCdrom is now current */ + g_free(menu->priv->current_iso_name); + if (menu->priv->cdrom != NULL) { + g_object_get(G_OBJECT(menu->priv->cdrom), + "file", &menu->priv->current_iso_name, + NULL); + } else { + menu->priv->current_iso_name = NULL; + } + g_object_notify(G_OBJECT(menu), "file"); + if (menu->priv->cdrom != NULL) { + ovirt_foreign_menu_next_async_step(menu, STATE_CDROM_FILE); + } else { + g_debug("Could not find VM cdrom through oVirt REST API"); + } +} + + +static void ovirt_foreign_menu_refresh_cdrom_file_async(OvirtForeignMenu *menu) +{ + g_return_if_fail(OVIRT_IS_RESOURCE(menu->priv->cdrom)); + + ovirt_resource_refresh_async(OVIRT_RESOURCE(menu->priv->cdrom), + menu->priv->proxy, NULL, + cdrom_file_refreshed_cb, menu); +} + + +static void cdroms_fetched_cb(GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GHashTable *cdroms; + OvirtCollection *cdrom_collection = OVIRT_COLLECTION(source_object); + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(user_data); + GHashTableIter iter; + OvirtCdrom *cdrom; + GError *error = NULL; + + ovirt_collection_fetch_finish(cdrom_collection, result, &error); + if (error != NULL) { + g_warning("failed to fetch cdrom collection: %s", error->message); + g_clear_error(&error); + return; + } + + cdroms = ovirt_collection_get_resources(cdrom_collection); + + g_warn_if_fail(g_hash_table_size(cdroms) <= 1); + + g_hash_table_iter_init(&iter, cdroms); + /* Set CDROM drive. If we have multiple ones, only the first + * one will be kept, but currently oVirt only adds one CDROM + * device per-VM + */ + if (g_hash_table_iter_next(&iter, NULL, (gpointer *)&cdrom)) { + if (menu->priv->cdrom != NULL) { + g_object_unref(G_OBJECT(menu->priv->cdrom)); + } + menu->priv->cdrom = g_object_ref(G_OBJECT(cdrom)); + g_debug("Set VM cdrom to %p", menu->priv->cdrom); + } + + if (menu->priv->cdrom != NULL) { + ovirt_foreign_menu_next_async_step(menu, STATE_VM_CDROM); + } else { + g_debug("Could not find VM cdrom through oVirt REST API"); + } +} + + +static void ovirt_foreign_menu_fetch_vm_cdrom_async(OvirtForeignMenu *menu) +{ + OvirtCollection *cdrom_collection; + + cdrom_collection = ovirt_vm_get_cdroms(menu->priv->vm); + ovirt_collection_fetch_async(cdrom_collection, menu->priv->proxy, NULL, + cdroms_fetched_cb, menu); +} + + +static void storage_domains_fetched_cb(GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(user_data); + OvirtCollection *collection = OVIRT_COLLECTION(source_object); + GHashTableIter iter; + OvirtStorageDomain *domain; + + ovirt_collection_fetch_finish(collection, result, &error); + if (error != NULL) { + g_warning("failed to fetch storage domains: %s", error->message); + g_clear_error(&error); + return; + } + + g_hash_table_iter_init(&iter, ovirt_collection_get_resources(collection)); + while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&domain)) { + OvirtCollection *file_collection; + int type; + + g_object_get(domain, "type", &type, NULL); + if (type != OVIRT_STORAGE_DOMAIN_TYPE_ISO) { + continue; + } + + file_collection = ovirt_storage_domain_get_files(domain); + if (file_collection != NULL) { + if (menu->priv->files) { + g_object_unref(G_OBJECT(menu->priv->files)); + } + menu->priv->files = g_object_ref(G_OBJECT(file_collection)); + g_debug("Set VM files to %p", menu->priv->files); + break; + } + } + + if (menu->priv->files != NULL) { + ovirt_foreign_menu_next_async_step(menu, STATE_STORAGE_DOMAIN); + } else { + g_debug("Could not find iso file collection"); + } +} + + +static void ovirt_foreign_menu_fetch_storage_domain_async(OvirtForeignMenu *menu) +{ + OvirtCollection *collection; + + g_debug("Start fetching oVirt REST collection"); + collection = ovirt_api_get_storage_domains(menu->priv->api); + ovirt_collection_fetch_async(collection, menu->priv->proxy, NULL, + storage_domains_fetched_cb, menu); +} + + +static void vms_fetched_cb(GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(user_data); + OvirtCollection *collection; + GHashTableIter iter; + OvirtVm *vm; + + collection = OVIRT_COLLECTION(source_object); + ovirt_collection_fetch_finish(collection, result, &error); + if (error != NULL) { + g_debug("failed to fetch VM list: %s", error->message); + g_clear_error(&error); + return; + } + + g_hash_table_iter_init(&iter, ovirt_collection_get_resources(collection)); + while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&vm)) { + char *guid; + + g_object_get(G_OBJECT(vm), "guid", &guid, NULL); + if (g_strcmp0(guid, menu->priv->vm_guid) == 0) { + menu->priv->vm = g_object_ref(vm); + g_free(guid); + break; + } + g_free(guid); + } + if (menu->priv->vm != NULL) { + ovirt_foreign_menu_next_async_step(menu, STATE_VM); + } else { + g_warning("failed to find a VM with guid \"%s\"", menu->priv->vm_guid); + } +} + + +static void ovirt_foreign_menu_fetch_vm_async(OvirtForeignMenu *menu) +{ + OvirtCollection *vms; + + g_return_if_fail(OVIRT_IS_FOREIGN_MENU(menu)); + g_return_if_fail(OVIRT_IS_PROXY(menu->priv->proxy)); + g_return_if_fail(OVIRT_IS_API(menu->priv->api)); + + vms = ovirt_api_get_vms(menu->priv->api); + ovirt_collection_fetch_async(vms, menu->priv->proxy, + NULL, vms_fetched_cb, menu); +} + + +static void api_fetched_cb(GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + OvirtProxy *proxy; + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(user_data); + + proxy = OVIRT_PROXY(source_object); + menu->priv->api = ovirt_proxy_fetch_api_finish(proxy, result, &error); + if (error != NULL) { + g_debug("failed to fetch toplevel API object: %s", error->message); + g_clear_error(&error); + return; + } + g_return_if_fail(OVIRT_IS_API(menu->priv->api)); + + ovirt_foreign_menu_next_async_step(menu, STATE_API); +} + + +static void ovirt_foreign_menu_fetch_api_async(OvirtForeignMenu *menu) +{ + g_debug("Start fetching oVirt main entry point"); + + g_return_if_fail(OVIRT_IS_FOREIGN_MENU(menu)); + g_return_if_fail(OVIRT_IS_PROXY(menu->priv->proxy)); + + ovirt_proxy_fetch_api_async(menu->priv->proxy, NULL, api_fetched_cb, menu); +} + + +static void iso_list_fetched_cb(GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + OvirtCollection *collection = OVIRT_COLLECTION(source_object); + GError *error = NULL; + GList *files; + + ovirt_collection_fetch_finish(collection, result, &error); + if (error != NULL) { + g_warning("failed to fetch files for ISO storage domain: %s", + error->message); + g_clear_error(&error); + return; + } + + files = g_hash_table_get_values(ovirt_collection_get_resources(collection)); + ovirt_foreign_menu_set_files(OVIRT_FOREIGN_MENU(user_data), files); + g_list_free(files); + + g_timeout_add_seconds(15, ovirt_foreign_menu_refresh_iso_list, user_data); +} + + +static void ovirt_foreign_menu_fetch_iso_list_async(OvirtForeignMenu *menu) +{ + if (menu->priv->files == NULL) { + return; + } + + ovirt_collection_fetch_async(menu->priv->files, menu->priv->proxy, + NULL, iso_list_fetched_cb, menu); +} + + +static gboolean ovirt_foreign_menu_refresh_iso_list(gpointer user_data) +{ + OvirtForeignMenu *menu; + + g_debug("Refreshing foreign menu iso list"); + menu = OVIRT_FOREIGN_MENU(user_data); + ovirt_foreign_menu_fetch_iso_list_async(menu); + + /* ovirt_foreign_menu_fetch_iso_list_async() will schedule a new call to + * that function through iso_list_fetched_cb() when it has finished + * fetching the iso list + */ + return G_SOURCE_REMOVE; +} + + +OvirtForeignMenu *ovirt_foreign_menu_new_from_file(VirtViewerFile *file) +{ + OvirtProxy *proxy = NULL; + OvirtForeignMenu *menu = NULL; + gboolean admin; + char *ca_str = NULL; + char *jsessionid = NULL; + char *url = NULL; + char *vm_guid = NULL; + GByteArray *ca = NULL; + + url = virt_viewer_file_get_ovirt_host(file); + vm_guid = virt_viewer_file_get_ovirt_vm_guid(file); + jsessionid = virt_viewer_file_get_ovirt_jsessionid(file); + ca_str = virt_viewer_file_get_ovirt_ca(file); + admin = virt_viewer_file_get_ovirt_admin(file); + + if ((url == NULL) || (vm_guid == NULL)) + goto end; + + proxy = ovirt_proxy_new(url); + if (proxy == NULL) + goto end; + + if (ca_str != NULL) { + ca = g_byte_array_new_take((guint8 *)ca_str, strlen(ca_str) + 1); + ca_str = NULL; + } + + g_object_set(G_OBJECT(proxy), + "admin", admin, + "session-id", jsessionid, + "ca-cert", ca, + NULL); + menu = g_object_new(OVIRT_TYPE_FOREIGN_MENU, + "proxy", proxy, + "vm-guid", vm_guid, + NULL); + +end: + g_free(url); + g_free(vm_guid); + g_free(jsessionid); + g_free(ca_str); + if (ca != NULL) { + g_byte_array_unref(ca); + } + + return menu; +} diff --git a/src/ovirt-foreign-menu.h b/src/ovirt-foreign-menu.h new file mode 100644 index 0000000..cf18b52 --- /dev/null +++ b/src/ovirt-foreign-menu.h @@ -0,0 +1,84 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2007-2014 Red Hat, Inc. + * Copyright (C) 2009-2012 Daniel P. Berrange + * Copyright (C) 2010 Marc-André Lureau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange + * Christophe Fergeau + */ +#ifndef _OVIRT_FOREIGN_MENU_H +#define _OVIRT_FOREIGN_MENU_H + +#include +#include +#include + +#include "virt-viewer-file.h" + +G_BEGIN_DECLS + +#define OVIRT_TYPE_FOREIGN_MENU ovirt_foreign_menu_get_type() + +#define OVIRT_FOREIGN_MENU(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), OVIRT_TYPE_FOREIGN_MENU, OvirtForeignMenu)) + +#define OVIRT_FOREIGN_MENU_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), OVIRT_TYPE_FOREIGN_MENU, OvirtForeignMenuClass)) + +#define OVIRT_IS_FOREIGN_MENU(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OVIRT_TYPE_FOREIGN_MENU)) + +#define OVIRTIS_FOREIGN_MENU_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), OVIRT_TYPE_FOREIGN_MENU)) + +#define OVIRT_FOREIGN_MENU_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), OVIRT_TYPE_FOREIGN_MENU, OvirtForeignMenuClass)) + +typedef struct _OvirtForeignMenu OvirtForeignMenu; +typedef struct _OvirtForeignMenuClass OvirtForeignMenuClass; +typedef struct _OvirtForeignMenuPrivate OvirtForeignMenuPrivate; + +struct _OvirtForeignMenu { + GObject parent; + + OvirtForeignMenuPrivate *priv; +}; + +struct _OvirtForeignMenuClass { + GObjectClass parent_class; +}; + +GType ovirt_foreign_menu_get_type(void); + +OvirtForeignMenu* ovirt_foreign_menu_new(OvirtProxy *proxy); +OvirtForeignMenu *ovirt_foreign_menu_new_from_file(VirtViewerFile *self); +void ovirt_foreign_menu_start(OvirtForeignMenu *menu); + +GtkWidget *ovirt_foreign_menu_get_gtk_menu(OvirtForeignMenu *foreign_menu); + +G_END_DECLS + +#endif /* _OVIRT_FOREIGN_MENU_H */ +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/src/remote-viewer-connect.c b/src/remote-viewer-connect.c new file mode 100644 index 0000000..d929b21 --- /dev/null +++ b/src/remote-viewer-connect.c @@ -0,0 +1,262 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2015 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include "remote-viewer-connect.h" +#include "virt-viewer-util.h" +#include +#include + +typedef struct +{ + gboolean response; + GMainLoop *loop; + GtkWidget *entry; +} ConnectionInfo; + +static void +shutdown_loop(GMainLoop *loop) +{ + if (g_main_loop_is_running(loop)) + g_main_loop_quit(loop); +} + +static gboolean +window_deleted_cb(ConnectionInfo *ci) +{ + ci->response = FALSE; + shutdown_loop(ci->loop); + return TRUE; +} + +static gboolean +key_pressed_cb(GtkWidget *widget G_GNUC_UNUSED, GdkEvent *event, gpointer data) +{ + GtkWidget *window = data; + gboolean retval; + if (event->type == GDK_KEY_PRESS) { + switch (event->key.keyval) { + case GDK_KEY_Escape: + g_signal_emit_by_name(window, "delete-event", NULL, &retval); + return TRUE; + default: + return FALSE; + } + } + + return FALSE; +} + +static void +connect_button_clicked_cb(GtkButton *button G_GNUC_UNUSED, gpointer data) +{ + ConnectionInfo *ci = data; + if (gtk_entry_get_text_length(GTK_ENTRY(ci->entry)) > 0) + { + ci->response = TRUE; + shutdown_loop(ci->loop); + } +} + +static void +connect_dialog_run(ConnectionInfo *ci) +{ + ci->loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(ci->loop); +} + +static void +entry_icon_release_cb(GtkEntry* entry, gpointer data G_GNUC_UNUSED) +{ + gtk_entry_set_text(entry, ""); + gtk_widget_grab_focus(GTK_WIDGET(entry)); +} + +static void +entry_changed_cb(GtkEditable* entry, gpointer data) +{ + GtkButton *connect_button = data; + gboolean rtl = (gtk_widget_get_direction(GTK_WIDGET(entry)) == GTK_TEXT_DIR_RTL); + gboolean active = (gtk_entry_get_text_length(GTK_ENTRY(entry)) > 0); + + gtk_widget_set_sensitive(GTK_WIDGET(connect_button), active); + + g_object_set(entry, + "secondary-icon-name", active ? (rtl ? "edit-clear-rtl-symbolic" : "edit-clear-symbolic") : NULL, + "secondary-icon-activatable", active, + "secondary-icon-sensitive", active, + NULL); +} + +static gboolean +entry_focus_in_cb(GtkWidget *widget G_GNUC_UNUSED, GdkEvent *event G_GNUC_UNUSED, gpointer data) +{ + GtkRecentChooser *recent = data; + gtk_recent_chooser_unselect_all(recent); + return FALSE; +} + +static void +entry_activated_cb(GtkEntry *entry G_GNUC_UNUSED, gpointer data) +{ + ConnectionInfo *ci = data; + if (gtk_entry_get_text_length(GTK_ENTRY(ci->entry)) > 0) + { + ci->response = TRUE; + shutdown_loop(ci->loop); + } +} + +static void +recent_selection_changed_dialog_cb(GtkRecentChooser *chooser, gpointer data) +{ + GtkRecentInfo *info; + GtkWidget *entry = data; + const gchar *uri; + + info = gtk_recent_chooser_get_current_item(chooser); + if (info == NULL) + return; + + uri = gtk_recent_info_get_uri(info); + g_return_if_fail(uri != NULL); + + gtk_entry_set_text(GTK_ENTRY(entry), uri); + + gtk_recent_info_unref(info); +} + +static void +recent_item_activated_dialog_cb(GtkRecentChooser *chooser G_GNUC_UNUSED, gpointer data) +{ + ConnectionInfo *ci = data; + ci->response = TRUE; + shutdown_loop(ci->loop); +} + +static void +make_label_small(GtkLabel* label) +{ + PangoAttrList* attributes = pango_attr_list_new(); + pango_attr_list_insert(attributes, pango_attr_scale_new(0.9)); + gtk_label_set_attributes(label, attributes); + pango_attr_list_unref(attributes); +} + +/** +* remote_viewer_connect_dialog +* +* @brief Opens connect dialog for remote viewer +* +* @param uri For returning the uri of chosen server, must be NULL +* +* @return TRUE if Connect or ENTER is pressed +* @return FALSE if Cancel is pressed or dialog is closed +*/ +gboolean +remote_viewer_connect_dialog(gchar **uri) +{ + GtkWidget *window, *label, *entry, *recent, *connect_button, *cancel_button; + GtkRecentFilter *rfilter; + GtkBuilder *builder; + gboolean active; + + ConnectionInfo ci = { + FALSE, + NULL, + NULL + }; + + g_return_val_if_fail(uri && *uri == NULL, FALSE); + + /* Create the widgets */ + builder = virt_viewer_util_load_ui("remote-viewer-connect.xml"); + g_return_val_if_fail(builder != NULL, GTK_RESPONSE_NONE); + + window = GTK_WIDGET(gtk_builder_get_object(builder, "remote-viewer-connection-window")); + connect_button = GTK_WIDGET(gtk_builder_get_object(builder, "connect-button")); + cancel_button = GTK_WIDGET(gtk_builder_get_object(builder, "cancel-button")); + label = GTK_WIDGET(gtk_builder_get_object(builder, "example-label")); + entry = ci.entry = GTK_WIDGET(gtk_builder_get_object(builder, "connection-address-entry")); + + make_label_small(GTK_LABEL(label)); + + active = (gtk_entry_get_text_length(GTK_ENTRY(ci.entry)) > 0); + gtk_widget_set_sensitive(GTK_WIDGET(connect_button), active); + + recent = GTK_WIDGET(gtk_builder_get_object(builder, "recent-chooser")); + + rfilter = gtk_recent_filter_new(); + gtk_recent_filter_add_mime_type(rfilter, "application/x-spice"); + gtk_recent_filter_add_mime_type(rfilter, "application/x-vnc"); + gtk_recent_filter_add_mime_type(rfilter, "application/x-virt-viewer"); + gtk_recent_chooser_set_filter(GTK_RECENT_CHOOSER(recent), rfilter); + gtk_recent_chooser_set_local_only(GTK_RECENT_CHOOSER(recent), FALSE); + + g_signal_connect(window, "key-press-event", + G_CALLBACK(key_pressed_cb), window); + g_signal_connect(connect_button, "clicked", + G_CALLBACK(connect_button_clicked_cb), &ci); + + /* make sure that user_data is passed as first parameter */ + g_signal_connect_swapped(cancel_button, "clicked", + G_CALLBACK(window_deleted_cb), &ci); + g_signal_connect_swapped(window, "delete-event", + G_CALLBACK(window_deleted_cb), &ci); + + g_signal_connect(entry, "activate", + G_CALLBACK(entry_activated_cb), &ci); + g_signal_connect(entry, "changed", + G_CALLBACK(entry_changed_cb), connect_button); + g_signal_connect(entry, "icon-release", + G_CALLBACK(entry_icon_release_cb), entry); + + g_signal_connect(recent, "selection-changed", + G_CALLBACK(recent_selection_changed_dialog_cb), entry); + g_signal_connect(recent, "item-activated", + G_CALLBACK(recent_item_activated_dialog_cb), &ci); + g_signal_connect(entry, "focus-in-event", + G_CALLBACK(entry_focus_in_cb), recent); + + /* show and wait for response */ + gtk_widget_show_all(window); + + connect_dialog_run(&ci); + if (ci.response == TRUE) { + *uri = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); + g_strstrip(*uri); + } else { + *uri = NULL; + } + + g_object_unref(builder); + gtk_widget_destroy(window); + + return ci.response; +} + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/src/remote-viewer-connect.h b/src/remote-viewer-connect.h new file mode 100644 index 0000000..f00581e --- /dev/null +++ b/src/remote-viewer-connect.h @@ -0,0 +1,36 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2015 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef REMOTE_VIEWER_CONNECT_H +#define REMOTE_VIEWER_CONNECT_H + +#include + +gboolean remote_viewer_connect_dialog(gchar **uri); + +#endif /* REMOTE_VIEWER_CONNECT_H */ + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/src/remote-viewer-connect.xml b/src/remote-viewer-connect.xml new file mode 100644 index 0000000..dcd14cf --- /dev/null +++ b/src/remote-viewer-connect.xml @@ -0,0 +1,152 @@ + + + + + False + Connection details + + + True + False + 10 + 20 + + + True + False + 6 + + + True + False + Connection Address + 0 + + + + + + False + True + 0 + + + + + True + True + + + False + True + 1 + + + + + True + False + 0 + False + For example, spice://foo.example.org:5900 + + + False + True + 2 + + + + + False + True + 0 + + + + + True + False + 6 + + + True + False + Recent connections + 0 + + + + + + False + True + 0 + + + + + False + 20 + False + False + mru + + + True + True + 1 + + + + + True + True + 2 + + + + + True + False + immediate + 6 + end + + + Cancel + True + True + True + + + True + True + 0 + + + + + Connect + True + True + True + + + True + True + 1 + + + + + False + False + end + 3 + + + + + + diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c index e8784ba..81cf736 100644 --- a/src/remote-viewer-main.c +++ b/src/remote-viewer-main.c @@ -47,7 +47,11 @@ static void remote_viewer_version(void) { - g_print(_("remote-viewer version %s\n"), VERSION BUILDID); + g_print(_("remote-viewer version %s"), VERSION BUILDID); +#ifdef REMOTE_VIEWER_OS_ID + g_print(" (OS ID: %s)", REMOTE_VIEWER_OS_ID); +#endif + g_print("\n"); exit(EXIT_SUCCESS); } @@ -134,7 +138,6 @@ g_printerr(_("%s\nRun '%s --help' to see a full list of available command line options\n"), error->message, base_name); g_free(base_name); - g_error_free(error); goto cleanup; } @@ -174,8 +177,14 @@ app = VIRT_VIEWER_APP(viewer); - if (!virt_viewer_app_start(app)) + if (!virt_viewer_app_start(app, &error)) { + if (g_error_matches(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED)) + ret = 0; + else if (error) { + virt_viewer_app_simple_message_dialog(app, error->message); + } goto cleanup; + } g_signal_connect(virt_viewer_app_get_session(app), "session-connected", G_CALLBACK(connected), app); @@ -189,6 +198,7 @@ if (viewer) g_object_unref(viewer); g_strfreev(args); + g_clear_error(&error); return ret; } diff --git a/src/remote-viewer.c b/src/remote-viewer.c index 85a794b..8e4754f 100644 --- a/src/remote-viewer.c +++ b/src/remote-viewer.c @@ -30,6 +30,8 @@ #ifdef HAVE_OVIRT #include +#include "ovirt-foreign-menu.h" +#include "virt-viewer-vm-connection.h" #endif #ifdef HAVE_SPICE_GTK @@ -44,6 +46,7 @@ #include "virt-viewer-file.h" #include "virt-viewer-session.h" #include "remote-viewer.h" +#include "remote-viewer-connect.h" #ifndef G_VALUE_INIT /* see bug https://bugzilla.gnome.org/show_bug.cgi?id=654793 */ #define G_VALUE_INIT { 0, { { 0 } } } @@ -54,8 +57,9 @@ SpiceCtrlController *controller; SpiceCtrlForeignMenu *ctrl_foreign_menu; #endif - GtkWidget *controller_menu; - GtkWidget *foreign_menu; +#ifdef HAVE_OVIRT + OvirtForeignMenu *ovirt_foreign_menu; +#endif gboolean open_recent_dialog; }; @@ -72,19 +76,29 @@ PROP_OPEN_RECENT_DIALOG }; -static gboolean remote_viewer_start(VirtViewerApp *self); +#ifdef HAVE_OVIRT +static OvirtVm * choose_vm(GtkWindow *main_window, + char **vm_name, + OvirtCollection *vms, + GError **error); +#endif + +static gboolean remote_viewer_start(VirtViewerApp *self, GError **error); #ifdef HAVE_SPICE_GTK static gboolean remote_viewer_activate(VirtViewerApp *self, GError **error); static void remote_viewer_window_added(VirtViewerApp *self, VirtViewerWindow *win); static void spice_foreign_menu_updated(RemoteViewer *self); -static gint connect_dialog(gchar **uri); +#endif static void remote_viewer_dispose (GObject *object) { +#if defined(HAVE_SPICE_GTK) || defined(HAVE_OVIRT) RemoteViewer *self = REMOTE_VIEWER(object); RemoteViewerPrivate *priv = self->priv; - +#endif + +#ifdef HAVE_SPICE_GTK if (priv->controller) { g_object_unref(priv->controller); priv->controller = NULL; @@ -94,10 +108,17 @@ g_object_unref(priv->ctrl_foreign_menu); priv->ctrl_foreign_menu = NULL; } +#endif + +#ifdef HAVE_OVIRT + if (priv->ovirt_foreign_menu) { + g_object_unref(priv->ovirt_foreign_menu); + priv->ovirt_foreign_menu = NULL; + } +#endif G_OBJECT_CLASS(remote_viewer_parent_class)->dispose (object); } -#endif static void remote_viewer_get_property (GObject *object, guint property_id, @@ -156,7 +177,7 @@ RemoteViewerPrivate *priv = self->priv; if (connect_error && priv->open_recent_dialog) { - if (virt_viewer_app_start(app)) { + if (virt_viewer_app_start(app, NULL)) { return; } } @@ -177,13 +198,11 @@ app_class->start = remote_viewer_start; app_class->deactivated = remote_viewer_deactivated; -#ifdef HAVE_SPICE_GTK object_class->dispose = remote_viewer_dispose; +#ifdef HAVE_SPICE_GTK app_class->activate = remote_viewer_activate; app_class->window_added = remote_viewer_window_added; -#endif - -#ifdef HAVE_SPICE_GTK + g_object_class_install_property(object_class, PROP_CONTROLLER, g_param_spec_object("controller", @@ -396,8 +415,7 @@ } static void -spice_menu_update_each(gpointer key G_GNUC_UNUSED, - gpointer value, +spice_menu_update_each(gpointer value, gpointer user_data) { spice_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value)); @@ -406,15 +424,15 @@ static void spice_ctrl_menu_updated(RemoteViewer *self) { - GHashTable *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); + GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); g_debug("Spice controller menu updated"); - g_hash_table_foreach(windows, spice_menu_update_each, self); -} - -static void -foreign_menu_update(RemoteViewer *self, VirtViewerWindow *win) + g_list_foreach(windows, spice_menu_update_each, self); +} + +static void +spice_foreign_menu_update(RemoteViewer *self, VirtViewerWindow *win) { GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "foreign-menu"); SpiceCtrlMenu *menu; @@ -445,21 +463,20 @@ } static void -foreign_menu_update_each(gpointer key G_GNUC_UNUSED, - gpointer value, - gpointer user_data) -{ - foreign_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value)); +spice_foreign_menu_update_each(gpointer value, + gpointer user_data) +{ + spice_foreign_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value)); } static void spice_foreign_menu_updated(RemoteViewer *self) { - GHashTable *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); + GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); g_debug("Spice foreign menu updated"); - g_hash_table_foreach(windows, foreign_menu_update_each, self); + g_list_foreach(windows, spice_foreign_menu_update_each, self); } static SpiceSession * @@ -616,17 +633,17 @@ } static void -remote_viewer_window_added(VirtViewerApp *app G_GNUC_UNUSED, +remote_viewer_window_added(VirtViewerApp *app, VirtViewerWindow *win) { spice_menu_update(REMOTE_VIEWER(app), win); - foreign_menu_update(REMOTE_VIEWER(app), win); + spice_foreign_menu_update(REMOTE_VIEWER(app), win); } #endif #ifdef HAVE_OVIRT static gboolean -parse_ovirt_uri(const gchar *uri_str, char **rest_uri, char **name) +parse_ovirt_uri(const gchar *uri_str, char **rest_uri, char **name, char **username) { char *vm_name = NULL; char *rel_path; @@ -639,15 +656,24 @@ g_return_val_if_fail(name != NULL, FALSE); uri = xmlParseURI(uri_str); - if (uri == NULL) - return FALSE; + g_return_val_if_fail(uri != NULL, FALSE); if (g_strcmp0(uri->scheme, "ovirt") != 0) { xmlFreeURI(uri); return FALSE; } + if (username && uri->user) + *username = g_strdup(uri->user); + if (uri->path == NULL) { + *name = NULL; + *rest_uri = g_strdup(uri->server); + xmlFreeURI(uri); + return TRUE; + } + + if (*uri->path != '/') { xmlFreeURI(uri); return FALSE; } @@ -658,7 +684,6 @@ element_count = g_strv_length(path_elements); if (element_count == 0) { g_strfreev(path_elements); - xmlFreeURI(uri); return FALSE; } vm_name = path_elements[element_count-1]; @@ -666,8 +691,7 @@ /* build final URI */ rel_path = g_strjoinv("/", path_elements); - /* FIXME: how to decide between http and https? */ - *rest_uri = g_strdup_printf("https://%s/%s/api/", uri->server, rel_path); + *rest_uri = g_strdup_printf("%s%s", uri->server, rel_path); *name = vm_name; g_free(rel_path); g_strfreev(path_elements); @@ -683,31 +707,122 @@ authenticate_cb(RestProxy *proxy, G_GNUC_UNUSED RestProxyAuth *auth, G_GNUC_UNUSED gboolean retrying, gpointer user_data) { - gchar *username; - gchar *password; + gchar *username = NULL; + gchar *password = NULL; VirtViewerWindow *window; + gboolean success = FALSE; + + g_object_get(proxy, + "username", &username, + NULL); + + if (username == NULL || *username == '\0') + username = g_strdup(g_get_user_name()); window = virt_viewer_app_get_main_window(VIRT_VIEWER_APP(user_data)); - int ret = virt_viewer_auth_collect_credentials(virt_viewer_window_get_window(window), + success = virt_viewer_auth_collect_credentials(virt_viewer_window_get_window(window), "oVirt", NULL, &username, &password); - if (ret < 0) { - return FALSE; - } else { + if (success) { g_object_set(G_OBJECT(proxy), "username", username, "password", password, NULL); - g_free(username); - g_free(password); - return TRUE; - } +#ifdef HAVE_OVIRT_CANCEL + } else { + rest_proxy_auth_cancel(auth); +#endif + } + + g_free(username); + g_free(password); + return success; +} + +static void +ovirt_foreign_menu_update(RemoteViewer *app, VirtViewerWindow *win) +{ + GtkWidget *menu = g_object_get_data(G_OBJECT(win), "foreign-menu"); + GtkWidget *submenu; + GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu")); + + if (app->priv->ovirt_foreign_menu == NULL) { + /* nothing to do */ + return; + } + if (menu == NULL) { + menu = gtk_menu_item_new_with_label(_("_Change CD")); + gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menu), TRUE); + gtk_menu_shell_append(shell, menu); + g_object_set_data_full(G_OBJECT(win), "foreign-menu", + g_object_ref(menu), + (GDestroyNotify)gtk_widget_destroy); + } + + submenu = ovirt_foreign_menu_get_gtk_menu(app->priv->ovirt_foreign_menu); + if (submenu != NULL) { + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu); + } else { + /* No items to show, no point in showing the menu */ + g_object_set_data(G_OBJECT(win), "foreign-menu", NULL); + } + + gtk_widget_show_all(menu); +} + +static void +ovirt_foreign_menu_update_each(gpointer value, + gpointer user_data) +{ + ovirt_foreign_menu_update(REMOTE_VIEWER(user_data), + VIRT_VIEWER_WINDOW(value)); +} + +static void +ovirt_foreign_menu_updated(RemoteViewer *self) +{ + GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); + + g_debug("Spice foreign menu updated"); + + g_list_foreach(windows, ovirt_foreign_menu_update_each, self); +} + +static void +ovirt_foreign_menu_changed(OvirtForeignMenu *foreign_menu G_GNUC_UNUSED, + GParamSpec *pspec G_GNUC_UNUSED, + VirtViewerApp *app) +{ + ovirt_foreign_menu_updated(REMOTE_VIEWER(app)); +} + + +static void +virt_viewer_app_set_ovirt_foreign_menu(VirtViewerApp *app, + OvirtForeignMenu *foreign_menu) +{ + RemoteViewer *self; + g_return_if_fail(REMOTE_VIEWER_IS(app)); + g_return_if_fail(OVIRT_IS_FOREIGN_MENU(foreign_menu)); + + self = REMOTE_VIEWER(app); + if (self->priv->ovirt_foreign_menu != NULL) { + g_object_unref(G_OBJECT(self->priv->ovirt_foreign_menu)); + } + self->priv->ovirt_foreign_menu = foreign_menu; + g_signal_connect(G_OBJECT(foreign_menu), "notify::file", + (GCallback)ovirt_foreign_menu_changed, app); + g_signal_connect(G_OBJECT(foreign_menu), "notify::files", + (GCallback)ovirt_foreign_menu_changed, app); + g_signal_connect(G_OBJECT(app), "window-added", + (GCallback)ovirt_foreign_menu_update, NULL); + ovirt_foreign_menu_start(foreign_menu); } static gboolean -create_ovirt_session(VirtViewerApp *app, const char *uri) +create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err) { OvirtProxy *proxy = NULL; OvirtApi *api = NULL; @@ -718,9 +833,11 @@ GError *error = NULL; char *rest_uri = NULL; char *vm_name = NULL; + char *username = NULL; gboolean success = FALSE; guint port; guint secure_port; + char *proxy_url = NULL; OvirtVmDisplayType type; const char *session_type; @@ -729,14 +846,20 @@ gchar *ghost = NULL; gchar *ticket = NULL; gchar *host_subject = NULL; + gchar *guid = NULL; g_return_val_if_fail(VIRT_VIEWER_IS_APP(app), FALSE); - if (!parse_ovirt_uri(uri, &rest_uri, &vm_name)) + if (!parse_ovirt_uri(uri, &rest_uri, &vm_name, &username)) { + g_set_error_literal(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("failed to parse ovirt uri")); goto error; + } + proxy = ovirt_proxy_new(rest_uri); - if (proxy == NULL) - goto error; + g_object_set(proxy, + "username", username, + NULL); ovirt_set_proxy_options(proxy); g_signal_connect(G_OBJECT(proxy), "authenticate", G_CALLBACK(authenticate_cb), app); @@ -744,6 +867,14 @@ api = ovirt_proxy_fetch_api(proxy, &error); if (error != NULL) { g_debug("failed to get oVirt 'api' collection: %s", error->message); +#ifdef HAVE_OVIRT_CANCEL + if (g_error_matches(error, OVIRT_REST_CALL_ERROR, OVIRT_REST_CALL_ERROR_CANCELLED)) { + g_clear_error(&error); + g_set_error_literal(&error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED, + _("Authentication was cancelled")); + } +#endif goto error; } vms = ovirt_api_get_vms(api); @@ -752,22 +883,40 @@ g_debug("failed to lookup %s: %s", vm_name, error->message); goto error; } - vm = OVIRT_VM(ovirt_collection_lookup_resource(vms, vm_name)); - g_return_val_if_fail(vm != NULL, FALSE); + if (vm_name == NULL || + (vm = OVIRT_VM(ovirt_collection_lookup_resource(vms, vm_name))) == NULL) { + VirtViewerWindow *main_window = virt_viewer_app_get_main_window(app); + vm = choose_vm(virt_viewer_window_get_window(main_window), + &vm_name, + vms, + &error); + if (vm == NULL) { + goto error; + } + } g_object_get(G_OBJECT(vm), "state", &state, NULL); if (state != OVIRT_VM_STATE_UP) { - g_debug("oVirt VM %s is not running", vm_name); + g_set_error(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("oVirt VM %s is not running"), vm_name); + g_debug("%s", error->message); goto error; } + g_object_set(app, "guest-name", vm_name, NULL); if (!ovirt_vm_get_ticket(vm, proxy, &error)) { g_debug("failed to get ticket for %s: %s", vm_name, error->message); goto error; } - g_object_get(G_OBJECT(vm), "display", &display, NULL); + g_object_get(G_OBJECT(vm), "display", &display, "guid", &guid, NULL); if (display == NULL) { + g_set_error(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("oVirt VM %s has no display"), vm_name); goto error; + } + + if (guid != NULL) { + g_object_set(app, "uuid", guid, NULL); } g_object_get(G_OBJECT(display), @@ -777,23 +926,43 @@ "secure-port", &secure_port, "ticket", &ticket, "host-subject", &host_subject, + "proxy-url", &proxy_url, NULL); - gport = g_strdup_printf("%d", port); - gtlsport = g_strdup_printf("%d", secure_port); + if (port != 0) { + gport = g_strdup_printf("%d", port); + } + if (secure_port != 0) { + gtlsport = g_strdup_printf("%d", secure_port); + } + + if (ghost == NULL) { + g_set_error(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("oVirt VM %s has no host information"), vm_name); + g_debug("%s", error->message); + goto error; + } if (type == OVIRT_VM_DISPLAY_SPICE) { session_type = "spice"; } else if (type == OVIRT_VM_DISPLAY_VNC) { session_type = "vnc"; } else { - g_debug("Unknown display type: %d", type); + g_set_error(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("oVirt VM %s has unknown display type: %d"), vm_name, type); + g_debug("%s", error->message); goto error; + } + + { + OvirtForeignMenu *ovirt_menu = ovirt_foreign_menu_new(proxy); + g_object_set(G_OBJECT(ovirt_menu), "api", api, "vm", vm, NULL); + virt_viewer_app_set_ovirt_foreign_menu(app, ovirt_menu); } virt_viewer_app_set_connect_info(app, NULL, ghost, gport, gtlsport, session_type, NULL, NULL, 0, NULL); - if (virt_viewer_app_create_session(app, session_type) < 0) + if (!virt_viewer_app_create_session(app, session_type, &error)) goto error; #ifdef HAVE_SPICE_GTK @@ -805,6 +974,7 @@ g_object_set(G_OBJECT(session), "password", ticket, "cert-subject", host_subject, + "proxy", proxy_url, NULL); g_object_get(G_OBJECT(proxy), "ca-cert", &ca_cert, NULL); if (ca_cert != NULL) { @@ -819,6 +989,7 @@ success = TRUE; error: + g_free(username); g_free(rest_uri); g_free(vm_name); g_free(ticket); @@ -826,9 +997,11 @@ g_free(gtlsport); g_free(ghost); g_free(host_subject); + g_free(guid); + g_free(proxy_url); if (error != NULL) - g_error_free(error); + g_propagate_error(err, error); if (display != NULL) g_object_unref(display); if (vm != NULL) @@ -843,163 +1016,50 @@ #endif -static void entry_icon_release_cb(GtkEntry* entry, gpointer data G_GNUC_UNUSED) -{ - gtk_entry_set_text(entry, ""); - gtk_widget_grab_focus(GTK_WIDGET(entry)); -} - -static void entry_changed_cb(GtkEditable* entry, gpointer data G_GNUC_UNUSED) -{ - gboolean rtl = (gtk_widget_get_direction(GTK_WIDGET(entry)) == GTK_TEXT_DIR_RTL); - gboolean active = gtk_entry_get_text_length(GTK_ENTRY(entry)) > 0; - - g_object_set(entry, - "secondary-icon-name", active ? (rtl ? "edit-clear-rtl-symbolic" : "edit-clear-symbolic") : NULL, - "secondary-icon-activatable", active, - "secondary-icon-sensitive", active, - NULL); -} - -static void -recent_selection_changed_dialog_cb(GtkRecentChooser *chooser, gpointer data) -{ - GtkRecentInfo *info; - GtkWidget *entry = data; - const gchar *uri; - - info = gtk_recent_chooser_get_current_item(chooser); - if (info == NULL) - return; - - uri = gtk_recent_info_get_uri(info); - g_return_if_fail(uri != NULL); - - gtk_entry_set_text(GTK_ENTRY(entry), uri); - - gtk_recent_info_unref(info); -} - -static void -recent_item_activated_dialog_cb(GtkRecentChooser *chooser G_GNUC_UNUSED, gpointer data) -{ - gtk_dialog_response(GTK_DIALOG (data), GTK_RESPONSE_ACCEPT); -} - -static void make_label_light(GtkLabel* label) -{ - PangoAttrList* attributes = pango_attr_list_new(); -#if GTK_CHECK_VERSION(3, 0, 0) - gtk_style_context_add_class(gtk_widget_get_style_context(GTK_WIDGET(label)), "dim-label"); -#else - GtkStyle* style = gtk_widget_get_style(GTK_WIDGET(label)); - GdkColor* c = &style->text[GTK_STATE_INSENSITIVE]; - pango_attr_list_insert(attributes, pango_attr_foreground_new(c->red, c->green, c->blue)); -#endif - pango_attr_list_insert(attributes, pango_attr_scale_new(0.9)); - gtk_label_set_attributes(label, attributes); - pango_attr_list_unref(attributes); -} - -static void make_label_bold(GtkLabel* label) -{ - PangoAttrList* attributes = pango_attr_list_new(); - pango_attr_list_insert(attributes, pango_attr_weight_new(PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes(label, attributes); - pango_attr_list_unref(attributes); - -} - -static gint -connect_dialog(gchar **uri) -{ - GtkWidget *dialog, *area, *box, *label, *entry, *recent; -#if !GTK_CHECK_VERSION(3, 0, 0) - GtkWidget *alignment; -#endif - GtkRecentFilter *rfilter; - gint retval; - - /* Create the widgets */ - dialog = gtk_dialog_new_with_buttons(_("Connection details"), - NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - GTK_STOCK_CONNECT, - GTK_RESPONSE_ACCEPT, - NULL); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); - gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); - area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); - box = gtk_vbox_new(FALSE, 6); - gtk_container_set_border_width(GTK_CONTAINER(box), 5); - gtk_box_pack_start(GTK_BOX(area), box, TRUE, TRUE, 0); - - label = gtk_label_new_with_mnemonic(_("_Connection Address")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); - entry = GTK_WIDGET(gtk_entry_new()); - gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); - g_object_set(entry, "width-request", 200, NULL); - g_signal_connect(entry, "changed", G_CALLBACK(entry_changed_cb), entry); - g_signal_connect(entry, "icon-release", G_CALLBACK(entry_icon_release_cb), entry); - gtk_box_pack_start(GTK_BOX(box), entry, TRUE, TRUE, 0); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); - make_label_bold(GTK_LABEL(label)); - - label = gtk_label_new(_("For example, spice://foo.example.org:5900")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - make_label_light(GTK_LABEL(label)); -#if GTK_CHECK_VERSION(3, 0, 0) - gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); - gtk_widget_set_margin_bottom(label, 12); -#else - alignment = gtk_alignment_new(0, 0, 1, 1); - gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 12, 0, 0); - gtk_container_add(GTK_CONTAINER(alignment), label); - gtk_box_pack_start(GTK_BOX(box), alignment, TRUE, TRUE, 0); -#endif - - label = gtk_label_new_with_mnemonic(_("_Recent Connections")); - make_label_bold(GTK_LABEL(label)); - gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - recent = GTK_WIDGET(gtk_recent_chooser_widget_new()); - gtk_recent_chooser_set_show_icons(GTK_RECENT_CHOOSER(recent), FALSE); - gtk_recent_chooser_set_sort_type(GTK_RECENT_CHOOSER(recent), GTK_RECENT_SORT_MRU); - gtk_box_pack_start(GTK_BOX(box), recent, TRUE, TRUE, 0); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), recent); - - rfilter = gtk_recent_filter_new(); - gtk_recent_filter_add_mime_type(rfilter, "application/x-spice"); - gtk_recent_filter_add_mime_type(rfilter, "application/x-vnc"); - gtk_recent_filter_add_mime_type(rfilter, "application/x-virt-viewer"); - gtk_recent_chooser_set_filter(GTK_RECENT_CHOOSER(recent), rfilter); - gtk_recent_chooser_set_local_only(GTK_RECENT_CHOOSER(recent), FALSE); - g_signal_connect(recent, "selection-changed", - G_CALLBACK(recent_selection_changed_dialog_cb), entry); - g_signal_connect(recent, "item-activated", - G_CALLBACK(recent_item_activated_dialog_cb), dialog); - - /* show and wait for response */ - gtk_widget_show_all(dialog); - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - *uri = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); - g_strstrip(*uri); - retval = 0; - } else { - *uri = NULL; - retval = -1; - } - gtk_widget_destroy(dialog); - - return retval; -} +#ifdef HAVE_OVIRT +static OvirtVm * +choose_vm(GtkWindow *main_window, + char **vm_name, + OvirtCollection *vms_collection, + GError **error) +{ + GtkListStore *model; + GtkTreeIter iter; + GHashTable *vms; + GHashTableIter vms_iter; + OvirtVmState state; + OvirtVm *vm; + + g_return_val_if_fail(vm_name != NULL, NULL); + free(*vm_name); + + model = gtk_list_store_new(1, G_TYPE_STRING); + + vms = ovirt_collection_get_resources(vms_collection); + g_hash_table_iter_init(&vms_iter, vms); + while (g_hash_table_iter_next(&vms_iter, (gpointer *) vm_name, (gpointer *) &vm)) { + g_object_get(G_OBJECT(vm), "state", &state, NULL); + if (state == OVIRT_VM_STATE_UP) { + gtk_list_store_append(model, &iter); + gtk_list_store_set(model, &iter, 0, *vm_name, -1); + } + } + + *vm_name = virt_viewer_vm_connection_choose_name_dialog(main_window, + GTK_TREE_MODEL(model), + error); + g_object_unref(model); + if (*vm_name == NULL) + return NULL; + + vm = OVIRT_VM(ovirt_collection_lookup_resource(vms_collection, *vm_name)); + + return vm; +} +#endif static gboolean -remote_viewer_start(VirtViewerApp *app) +remote_viewer_start(VirtViewerApp *app, GError **err) { g_return_val_if_fail(REMOTE_VIEWER_IS(app), FALSE); @@ -1016,8 +1076,8 @@ g_signal_connect(app, "notify", G_CALLBACK(app_notified), self); if (priv->controller) { - if (virt_viewer_app_create_session(app, "spice") < 0) { - virt_viewer_app_simple_message_dialog(app, _("Couldn't create a Spice session")); + if (!virt_viewer_app_create_session(app, "spice", &error)) { + g_debug("Couldn't create a Spice session"); goto cleanup; } @@ -1036,8 +1096,13 @@ #endif retry_dialog: if (priv->open_recent_dialog) { - if (connect_dialog(&guri) != 0) + if (!remote_viewer_connect_dialog(&guri)) { + g_set_error_literal(&error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED, + _("No connection was chosen")); + g_propagate_error(err, error); return FALSE; + } g_object_set(app, "guri", guri, NULL); } else g_object_get(app, "guri", &guri, NULL); @@ -1052,46 +1117,54 @@ vvfile = virt_viewer_file_new(path, &error); g_free(path); if (error) { - virt_viewer_app_simple_message_dialog(app, _("Invalid file %s"), guri); + g_prefix_error(&error, _("Invalid file %s: "), guri); g_warning("%s", error->message); - g_clear_error(&error); goto cleanup; } g_object_get(G_OBJECT(vvfile), "type", &type, NULL); } else if (virt_viewer_util_extract_host(guri, &type, NULL, NULL, NULL, NULL) < 0 || type == NULL) { - virt_viewer_app_simple_message_dialog(app, _("Cannot determine the connection type from URI")); + g_set_error_literal(&error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Cannot determine the connection type from URI")); goto cleanup; } #ifdef HAVE_OVIRT if (g_strcmp0(type, "ovirt") == 0) { - if (!create_ovirt_session(app, guri)) { - virt_viewer_app_simple_message_dialog(app, _("Couldn't open oVirt session")); + if (!create_ovirt_session(app, guri, &error)) { + g_prefix_error(&error, _("Couldn't open oVirt session: ")); goto cleanup; } } else #endif { - if (virt_viewer_app_create_session(app, type) < 0) { - virt_viewer_app_simple_message_dialog(app, _("Couldn't create a session for this type: %s"), type); + if (!virt_viewer_app_create_session(app, type, &error)) goto cleanup; + } + + virt_viewer_session_set_file(virt_viewer_app_get_session(app), vvfile); +#ifdef HAVE_OVIRT + if (vvfile != NULL) { + OvirtForeignMenu *ovirt_menu; + ovirt_menu = ovirt_foreign_menu_new_from_file(vvfile); + if (ovirt_menu != NULL) { + virt_viewer_app_set_ovirt_foreign_menu(app, ovirt_menu); } } - - virt_viewer_session_set_file(virt_viewer_app_get_session(app), vvfile); +#endif if (!virt_viewer_app_initial_connect(app, &error)) { - const gchar *msg = error ? error->message : - _("Failed to initiate connection"); - - virt_viewer_app_simple_message_dialog(app, msg); - g_clear_error(&error); + if (error == NULL) { + g_set_error_literal(&error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Failed to initiate connection")); + } goto cleanup; } #ifdef HAVE_SPICE_GTK } #endif - ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app); + ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app, &error); cleanup: g_clear_object(&file); @@ -1102,8 +1175,11 @@ type = NULL; if (!ret && priv->open_recent_dialog) { + g_clear_error(&error); goto retry_dialog; } + if (error != NULL) + g_propagate_error(err, error); return ret; } diff --git a/src/test-version-compare.c b/src/test-version-compare.c new file mode 100644 index 0000000..f14887b --- /dev/null +++ b/src/test-version-compare.c @@ -0,0 +1,61 @@ +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2015 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include + +gboolean doDebug = FALSE; + +int main(void) +{ + g_assert(virt_viewer_compare_buildid("1-1", "1-1") == 0); + g_assert(virt_viewer_compare_buildid("1-1", "1-1.1") < 0); + g_assert(virt_viewer_compare_buildid("1-1", "1-2") < 0); + g_assert(virt_viewer_compare_buildid("1-3", "1-2") > 0); + g_assert(virt_viewer_compare_buildid("2-3", "1-2") > 0); + g_assert(virt_viewer_compare_buildid("2-3", "3-2") < 0); + g_assert(virt_viewer_compare_buildid("2-3", "3-4") < 0); + g_assert(virt_viewer_compare_buildid("4-3", "3-4") > 0); + + g_assert(virt_viewer_compare_buildid("4.0-", "3-4") > 0); + g_assert(virt_viewer_compare_buildid("4.0-", "3.4-4") > 0); + g_assert(virt_viewer_compare_buildid(".0-", "3.4-4") < 0); + g_assert(virt_viewer_compare_buildid("4-", "3-4") > 0); + g_assert(virt_viewer_compare_buildid("4-3", "3-") > 0); + g_assert(virt_viewer_compare_buildid("-3", "3-4") < 0); + g_assert(virt_viewer_compare_buildid("4-3", "-4") > 0); + g_assert(virt_viewer_compare_buildid("-3", "-4") < 0); + g_assert(virt_viewer_compare_buildid("4", "3-4") > 0); + g_assert(virt_viewer_compare_buildid("4-3", "3") > 0); + g_assert(virt_viewer_compare_buildid("3", "3-4") < 0); + g_assert(virt_viewer_compare_buildid("4-3", "4") > 0); + g_assert(virt_viewer_compare_buildid("-3", "-4") < 0); + + /* These trigger runtime warnings */ + g_assert(virt_viewer_compare_buildid("-3", "-") > 0); + g_assert(virt_viewer_compare_buildid("", "-") == 0); + g_assert(virt_viewer_compare_buildid("", "") == 0); + g_assert(virt_viewer_compare_buildid("", NULL) == 0); + g_assert(virt_viewer_compare_buildid(NULL, NULL) == 0); + + return 0; +} diff --git a/src/view/autoDrawer.c b/src/view/autoDrawer.c index deb8111..cbf92de 100644 --- a/src/view/autoDrawer.c +++ b/src/view/autoDrawer.c @@ -325,6 +325,7 @@ if (priv->delayConnection) { g_source_remove(priv->delayConnection); + priv->delayConnection = 0; } if (priv->forceClosing) { diff --git a/src/virt-glib-compat.h b/src/virt-glib-compat.h index 37b6f61..1242289 100644 --- a/src/virt-glib-compat.h +++ b/src/virt-glib-compat.h @@ -69,6 +69,13 @@ #if !GLIB_CHECK_VERSION(2,32,0) GByteArray *g_byte_array_new_take (guint8 *data, gsize len); + +#define G_SOURCE_CONTINUE TRUE +#define G_SOURCE_REMOVE FALSE +#endif + +#if GLIB_CHECK_VERSION(2,31,0) +#define g_mutex_new() g_new0(GMutex, 1) #endif G_END_DECLS diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c index 1c97121..653b30c 100644 --- a/src/virt-viewer-app.c +++ b/src/virt-viewer-app.c @@ -80,8 +80,8 @@ static void virt_viewer_app_auth_refused(VirtViewerSession *session, const char *msg, VirtViewerApp *self); -static void virt_viewer_app_auth_failed(VirtViewerSession *session, - const char *msg, +static void virt_viewer_app_auth_unsupported(VirtViewerSession *session, + const char *msg, VirtViewerApp *self); static void virt_viewer_app_usb_failed(VirtViewerSession *session, const char *msg, @@ -108,10 +108,12 @@ struct _VirtViewerAppPrivate { VirtViewerWindow *main_window; GtkWidget *main_notebook; - GHashTable *windows; - GArray *initial_display_map; + GList *windows; + GHashTable *displays; + GHashTable *initial_display_map; gchar *clipboard; - + GtkWidget *preferences; + GtkFileChooser *preferences_shared_folder; gboolean direct; gboolean verbose; gboolean enable_accel; @@ -126,7 +128,6 @@ gboolean active; gboolean connected; gboolean cancelled; - guint reconnect_poll; /* source id */ char *unixsock; char *guri; /* prefered over ghost:gport */ char *ghost; @@ -140,6 +141,7 @@ gchar *guest_name; gboolean grabbed; char *title; + char *uuid; gint focused; GKeyFile *config; @@ -169,6 +171,7 @@ PROP_HAS_FOCUS, PROP_KIOSK, PROP_QUIT_ON_DISCONNECT, + PROP_UUID, }; enum { @@ -256,6 +259,20 @@ g_warning("failed to create config directory"); g_free(dir); + if (priv->uuid && priv->guest_name) { + // if there's no comment for this uuid settings group, add a comment + // with the vm name so user can make sense of it later. + gchar *comment = g_key_file_get_comment(priv->config, priv->uuid, NULL, &error); + if (error) { + g_debug("Unable to get comment from key file: %s", error->message); + g_clear_error(&error); + } else { + if (!comment || *comment == '\0') + g_key_file_set_comment(priv->config, priv->uuid, NULL, priv->guest_name, NULL); + } + g_free(comment); + } + if ((data = g_key_file_to_data(priv->config, NULL, &error)) == NULL || !g_file_set_contents(priv->config_file, data, -1, &error)) { g_warning("Couldn't save configuration: %s", error->message); @@ -284,23 +301,58 @@ gtk_main_quit(); } -gint virt_viewer_app_get_n_initial_displays(VirtViewerApp* self) -{ - if (self->priv->initial_display_map) - return self->priv->initial_display_map->len; - +static gint +get_n_client_monitors() +{ return gdk_screen_get_n_monitors(gdk_screen_get_default()); } +GList* virt_viewer_app_get_initial_displays(VirtViewerApp* self) +{ + if (!self->priv->initial_display_map) { + GList *l = NULL; + gint i; + gint n = get_n_client_monitors(); + + for (i = 0; i < n; i++) { + l = g_list_append(l, GINT_TO_POINTER(i)); + } + return l; + } + return g_hash_table_get_keys(self->priv->initial_display_map); +} + +static gint virt_viewer_app_get_first_monitor(VirtViewerApp *self) +{ + if (self->priv->fullscreen && self->priv->initial_display_map) { + gint first = G_MAXINT; + GHashTableIter iter; + gpointer key, value; + g_hash_table_iter_init(&iter, self->priv->initial_display_map); + while (g_hash_table_iter_next(&iter, &key, &value)) { + gint monitor = GPOINTER_TO_INT(key); + first = MIN(first, monitor); + } + return first; + } + return 0; +} + gint virt_viewer_app_get_initial_monitor_for_display(VirtViewerApp* self, gint display) { - gint monitor = -1; + gint monitor = display; if (self->priv->initial_display_map) { - if (display < self->priv->initial_display_map->len) - monitor = g_array_index(self->priv->initial_display_map, gint, display); - } else { - monitor = display; + gpointer value = NULL; + if (g_hash_table_lookup_extended(self->priv->initial_display_map, GINT_TO_POINTER(display), NULL, &value)) { + monitor = GPOINTER_TO_INT(value); + } else { + monitor = -1; + } + } + if (monitor >= get_n_client_monitors()) { + g_debug("monitor for display %d does not exist", display); + monitor = -1; } return monitor; @@ -310,65 +362,139 @@ app_window_try_fullscreen(VirtViewerApp *self G_GNUC_UNUSED, VirtViewerWindow *win, gint nth) { - GdkScreen *screen = gdk_screen_get_default(); - - if (nth >= gdk_screen_get_n_monitors(screen)) { - g_debug("skipping display %d", nth); + gint monitor = virt_viewer_app_get_initial_monitor_for_display(self, nth); + if (monitor == -1) { + g_debug("skipping fullscreen for display %d", nth); return; } - virt_viewer_window_enter_fullscreen(win, nth); -} - - -void virt_viewer_app_set_uuid_string(VirtViewerApp* self, const gchar* uuid_string) -{ - GArray* mapping = NULL; - GError* error = NULL; - gsize ndisplays = 0; - gint* displays = NULL; - gint nmonitors = gdk_screen_get_n_monitors(gdk_screen_get_default()); - - g_debug("%s: UUID changed to %s", G_STRFUNC, uuid_string); - - displays = g_key_file_get_integer_list(self->priv->config, - uuid_string, "monitor-mapping", &ndisplays, &error); + virt_viewer_window_enter_fullscreen(win, monitor); +} + + +static GHashTable* +virt_viewer_app_parse_monitor_mappings(gchar **mappings, gsize nmappings) +{ + gint nmonitors = get_n_client_monitors(); + GHashTable *displaymap = g_hash_table_new(g_direct_hash, g_direct_equal); + GHashTable *monitormap = g_hash_table_new(g_direct_hash, g_direct_equal); + int i = 0; + int max_display_id = 0; + gchar **tokens = NULL; + + for (i = 0; i < nmappings; i++) { + gchar *endptr = NULL; + gint display = 0, monitor = 0; + + tokens = g_strsplit(mappings[i], ":", 2); + if (g_strv_length(tokens) != 2) { + g_warning("Invalid monitor-mapping configuration: '%s'. " + "Expected format is ':'", + mappings[i]); + g_strfreev(tokens); + goto configerror; + } + + display = strtol(tokens[0], &endptr, 10); + if ((endptr && *endptr != '\0') || display < 1) { + g_warning("Invalid monitor-mapping configuration: display id is invalid: %s %p='%s'", tokens[0], endptr, endptr); + g_strfreev(tokens); + goto configerror; + } + monitor = strtol(tokens[1], &endptr, 10); + if ((endptr && *endptr != '\0') || monitor < 1) { + g_warning("Invalid monitor-mapping configuration: monitor id '%s' is invalid", tokens[1]); + g_strfreev(tokens); + goto configerror; + } + g_strfreev(tokens); + + if (monitor > nmonitors) + g_warning("Initial monitor #%i for display #%i does not exist, skipping...", monitor, display); + else { + /* config file format is 1-based, not 0-based */ + display--; + monitor--; + + if (g_hash_table_lookup_extended(displaymap, GINT_TO_POINTER(display), NULL, NULL) || + g_hash_table_lookup_extended(monitormap, GINT_TO_POINTER(monitor), NULL, NULL)) { + g_warning("Invalid monitor-mapping configuration: a display or monitor id was specified twice"); + goto configerror; + } + g_debug("Fullscreen config: mapping guest display %i to monitor %i", display, monitor); + g_hash_table_insert(displaymap, GINT_TO_POINTER(display), GINT_TO_POINTER(monitor)); + g_hash_table_insert(monitormap, GINT_TO_POINTER(monitor), GINT_TO_POINTER(display)); + max_display_id = MAX(display, max_display_id); + } + } + + for (i = 0; i < max_display_id; i++) { + if (!g_hash_table_lookup_extended(displaymap, GINT_TO_POINTER(i), NULL, NULL)) { + g_warning("Invalid monitor-mapping configuration: display #%d was not specified", i+1); + goto configerror; + } + } + + g_hash_table_unref(monitormap); + return displaymap; + +configerror: + g_hash_table_unref(monitormap); + g_hash_table_unref(displaymap); + return NULL; +} + +static GHashTable* +virt_viewer_app_get_monitor_mapping_for_section(VirtViewerApp *self, const gchar *section) +{ + GError *error = NULL; + gsize nmappings = 0; + gchar **mappings = NULL; + GHashTable *mapping = NULL; + + mappings = g_key_file_get_string_list(self->priv->config, + section, "monitor-mapping", &nmappings, &error); if (error) { - if (error->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND) - g_warning("Error reading monitor assignments: %s", error->message); + if (error->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND + && error->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND) + g_warning("Error reading monitor assignments for %s: %s", section, error->message); g_clear_error(&error); } else { - int i = 0; - mapping = g_array_sized_new(FALSE, FALSE, sizeof(displays[0]), ndisplays); - // config file format is 1-based, not 0-based - for (i = 0; i < ndisplays; i++) { - gint val = displays[i] - 1; - - // sanity check - if (val >= nmonitors) - g_warning("Initial monitor #%i for display #%i does not exist, skipping...", val, i); - else - g_array_append_val(mapping, val); - } - g_free(displays); + mapping = virt_viewer_app_parse_monitor_mappings(mappings, nmappings); + } + g_strfreev(mappings); + + return mapping; +} + +static +void virt_viewer_app_set_uuid_string(VirtViewerApp *self, const gchar *uuid_string) +{ + GHashTable *mapping = NULL; + + g_debug("%s: UUID changed to %s", G_STRFUNC, uuid_string); + + g_free(self->priv->uuid); + self->priv->uuid = g_strdup(uuid_string); + mapping = virt_viewer_app_get_monitor_mapping_for_section(self, uuid_string); + if (!mapping) { + g_debug("No guest-specific fullscreen config, using fallback"); + mapping = virt_viewer_app_get_monitor_mapping_for_section(self, "fallback"); } if (self->priv->initial_display_map) - g_array_unref(self->priv->initial_display_map); + g_hash_table_unref(self->priv->initial_display_map); self->priv->initial_display_map = mapping; // if we're changing our initial display map, move any existing windows to // the appropriate monitors according to the per-vm configuration if (mapping && self->priv->fullscreen) { - GHashTableIter iter; - gpointer value; + GList *l; gint i = 0; - g_hash_table_iter_init(&iter, self->priv->windows); - while (g_hash_table_iter_next(&iter, NULL, &value)) { - gint monitor = virt_viewer_app_get_initial_monitor_for_display(self, i); - app_window_try_fullscreen(self, VIRT_VIEWER_WINDOW(value), monitor); + for (l = self->priv->windows; l; l = l->next) { + app_window_try_fullscreen(self, VIRT_VIEWER_WINDOW(l->data), i); i++; } } @@ -408,9 +534,8 @@ gboolean dont_ask = FALSE; g_object_get(check, "active", &dont_ask, NULL); - if (dont_ask) - g_key_file_set_boolean(self->priv->config, - "virt-viewer", "ask-quit", FALSE); + g_key_file_set_boolean(self->priv->config, + "virt-viewer", "ask-quit", !dont_ask); gtk_widget_destroy(dialog); switch (result) { @@ -426,8 +551,7 @@ } -static void count_window_visible(gpointer key G_GNUC_UNUSED, - gpointer value, +static void count_window_visible(gpointer value, gpointer user_data) { GtkWindow *win = virt_viewer_window_get_window(VIRT_VIEWER_WINDOW(value)); @@ -441,7 +565,7 @@ virt_viewer_app_get_n_windows_visible(VirtViewerApp *self) { guint n = 0; - g_hash_table_foreach(self->priv->windows, count_window_visible, &n); + g_list_foreach(self->priv->windows, count_window_visible, &n); return n; } @@ -468,8 +592,7 @@ return FALSE; } -static void hide_one_window(gpointer key G_GNUC_UNUSED, - gpointer value, +static void hide_one_window(gpointer value, gpointer user_data G_GNUC_UNUSED) { VirtViewerApp* self = VIRT_VIEWER_APP(user_data); @@ -480,7 +603,7 @@ static void virt_viewer_app_hide_all_windows(VirtViewerApp *app) { - g_hash_table_foreach(app->priv->windows, hide_one_window, app); + g_list_foreach(app->priv->windows, hide_one_window, app); } G_MODULE_EXPORT void @@ -546,6 +669,7 @@ const char *cmd[10]; char portstr[50]; int n = 0; + GString *cat; cmd[n++] = "ssh"; if (sshport) { @@ -558,17 +682,30 @@ cmd[n++] = sshuser; } cmd[n++] = sshhost; - cmd[n++] = "nc"; - if (port) { - cmd[n++] = host; - cmd[n++] = port; - } else { - cmd[n++] = "-U"; - cmd[n++] = unixsock; - } + + cat = g_string_new("if (command -v socat) >/dev/null 2>&1"); + + g_string_append(cat, "; then socat - "); + if (port) + g_string_append_printf(cat, "TCP:%s:%s", host, port); + else + g_string_append_printf(cat, "UNIX-CONNECT:%s", unixsock); + + g_string_append(cat, "; else nc "); + if (port) + g_string_append_printf(cat, "%s %s", host, port); + else + g_string_append_printf(cat, "-U %s", unixsock); + + g_string_append(cat, "; fi"); + + cmd[n++] = cat->str; cmd[n++] = NULL; - return virt_viewer_app_open_tunnel(cmd); + n = virt_viewer_app_open_tunnel(cmd); + g_string_free(cat, TRUE); + + return n; } static int @@ -576,6 +713,11 @@ { struct sockaddr_un addr; int fd; + + if (strlen(unixsock) + 1 > sizeof(addr.sun_path)) { + g_warning ("address is too long for unix socket_path: %s", unixsock); + return -1; + } memset(&addr, 0, sizeof addr); addr.sun_family = AF_UNIX; @@ -654,24 +796,27 @@ } static void -set_title(gpointer key, - gpointer value, +set_title(gpointer value, gpointer user_data) { - gint *nth = key; VirtViewerApp *app = user_data; VirtViewerWindow *window = value; - virt_viewer_app_set_window_subtitle(app, window, *nth); + VirtViewerDisplay *display = virt_viewer_window_get_display(window); + + if (!display) + return; + + virt_viewer_app_set_window_subtitle(app, window, + virt_viewer_display_get_nth(display)); } static void virt_viewer_app_set_all_window_subtitles(VirtViewerApp *app) { - g_hash_table_foreach(app->priv->windows, set_title, app); -} - -static void update_title(gpointer key G_GNUC_UNUSED, - gpointer value, + g_list_foreach(app->priv->windows, set_title, app); +} + +static void update_title(gpointer value, gpointer user_data G_GNUC_UNUSED) { virt_viewer_window_update_title(VIRT_VIEWER_WINDOW(value)); @@ -680,11 +825,10 @@ static void virt_viewer_app_update_title(VirtViewerApp *self) { - g_hash_table_foreach(self->priv->windows, update_title, NULL); -} - -static void set_usb_options_sensitive(gpointer key G_GNUC_UNUSED, - gpointer value, + g_list_foreach(self->priv->windows, update_title, NULL); +} + +static void set_usb_options_sensitive(gpointer value, gpointer user_data) { virt_viewer_window_set_usb_options_sensitive(VIRT_VIEWER_WINDOW(value), @@ -694,59 +838,35 @@ static void virt_viewer_app_set_usb_options_sensitive(VirtViewerApp *self, gboolean sensitive) { - g_hash_table_foreach(self->priv->windows, set_usb_options_sensitive, - GINT_TO_POINTER(sensitive)); + g_list_foreach(self->priv->windows, set_usb_options_sensitive, + GINT_TO_POINTER(sensitive)); +} + +static void +set_menus_sensitive(gpointer value, gpointer user_data) +{ + virt_viewer_window_set_menus_sensitive(VIRT_VIEWER_WINDOW(value), + GPOINTER_TO_INT(user_data)); +} + +void +virt_viewer_app_set_menus_sensitive(VirtViewerApp *self, gboolean sensitive) +{ + g_list_foreach(self->priv->windows, set_menus_sensitive, GINT_TO_POINTER(sensitive)); } static VirtViewerWindow * virt_viewer_app_get_nth_window(VirtViewerApp *self, gint nth) { - return g_hash_table_lookup(self->priv->windows, &nth); -} - -static gboolean -virt_viewer_app_remove_nth_window(VirtViewerApp *self, gint nth) -{ - VirtViewerWindow *win; - gboolean removed; - - g_return_val_if_fail(nth != 0, FALSE); - - win = virt_viewer_app_get_nth_window(self, nth); - g_return_val_if_fail(win != NULL, FALSE); - - g_debug("Remove window %d %p", nth, win); - g_object_ref(win); - removed = g_hash_table_remove(self->priv->windows, &nth); - g_warn_if_fail(removed); - virt_viewer_app_update_menu_displays(self); - - if (removed) - g_signal_emit(self, signals[SIGNAL_WINDOW_REMOVED], 0, win); - - g_object_unref(win); - - return removed; -} - -static void -virt_viewer_app_set_nth_window(VirtViewerApp *self, gint nth, VirtViewerWindow *win) -{ - gint *key; - - g_return_if_fail(virt_viewer_app_get_nth_window(self, nth) == NULL); - key = g_malloc(sizeof(gint)); - *key = nth; - g_debug("Insert window %d %p", nth, win); - g_hash_table_insert(self->priv->windows, key, win); - virt_viewer_app_set_window_subtitle(self, win, nth); - virt_viewer_app_update_menu_displays(self); - if (self->priv->session) { - virt_viewer_window_set_usb_options_sensitive(win, - virt_viewer_session_get_has_usbredir(self->priv->session)); - } - - g_signal_emit(self, signals[SIGNAL_WINDOW_ADDED], 0, win); + GList *l; + for (l = self->priv->windows; l; l = l->next) { + VirtViewerDisplay *display = virt_viewer_window_get_display(l->data); + if (display + && (virt_viewer_display_get_nth(display) == nth)) { + return l->data; + } + } + return NULL; } static void @@ -797,10 +917,19 @@ virt_viewer_window_set_kiosk(window, self->priv->kiosk); if (self->priv->main_window) virt_viewer_window_set_zoom_level(window, virt_viewer_window_get_zoom_level(self->priv->main_window)); - virt_viewer_app_set_nth_window(self, nth, window); + + self->priv->windows = g_list_append(self->priv->windows, window); + virt_viewer_app_set_window_subtitle(self, window, nth); + virt_viewer_app_update_menu_displays(self); + if (self->priv->session) { + virt_viewer_window_set_usb_options_sensitive(window, + virt_viewer_session_get_has_usbredir(self->priv->session)); + } + + g_signal_emit(self, signals[SIGNAL_WINDOW_ADDED], 0, window); + if (self->priv->fullscreen) - app_window_try_fullscreen(self, window, - virt_viewer_app_get_initial_monitor_for_display(self, nth)); + app_window_try_fullscreen(self, window, nth); w = virt_viewer_window_get_window(window); g_signal_connect(w, "hide", G_CALLBACK(viewer_window_visible_cb), self); @@ -810,39 +939,77 @@ return window; } +static VirtViewerWindow * +ensure_window_for_display(VirtViewerApp *self, VirtViewerDisplay *display) +{ + gint nth = virt_viewer_display_get_nth(display); + VirtViewerWindow *win = virt_viewer_app_get_nth_window(self, nth); + if (win == NULL) { + GList *l = self->priv->windows; + + /* There should always be at least a main window created at startup */ + g_return_val_if_fail(l != NULL, NULL); + /* if there's a window that doesn't yet have an associated display, use + * that window */ + for (; l; l = l->next) { + if (virt_viewer_window_get_display(VIRT_VIEWER_WINDOW(l->data)) == NULL) + break; + } + if (l && virt_viewer_window_get_display(VIRT_VIEWER_WINDOW(l->data)) == NULL) { + win = VIRT_VIEWER_WINDOW(l->data); + g_debug("Found a window without a display, reusing for display #%d", nth); + virt_viewer_app_set_window_subtitle(self, win, nth); + if (self->priv->fullscreen && !self->priv->kiosk) + app_window_try_fullscreen(self, win, nth); + } else { + win = virt_viewer_app_window_new(self, nth); + } + + virt_viewer_window_set_display(win, display); + } + + return win; +} + static void display_show_hint(VirtViewerDisplay *display, GParamSpec *pspec G_GNUC_UNUSED, - VirtViewerWindow *win) -{ - VirtViewerApp *self; - VirtViewerNotebook *nb = virt_viewer_window_get_notebook(win); + gpointer user_data G_GNUC_UNUSED) +{ + VirtViewerApp *self = virt_viewer_session_get_app(virt_viewer_display_get_session(display)); + VirtViewerNotebook *nb; + VirtViewerWindow *win; gint nth; guint hint; - g_object_get(win, - "app", &self, - NULL); g_object_get(display, "nth-display", &nth, "show-hint", &hint, NULL); + win = virt_viewer_app_get_nth_window(self, nth); + if (self->priv->fullscreen && - nth >= gdk_screen_get_n_monitors(gdk_screen_get_default())) { - virt_viewer_window_hide(win); + nth >= get_n_client_monitors()) { + if (win) + virt_viewer_window_hide(win); } else if (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED) { - virt_viewer_window_hide(win); - } else if (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_READY) { - virt_viewer_notebook_show_display(nb); - virt_viewer_window_show(win); + if (win) + virt_viewer_window_hide(win); } else { - if (!self->priv->kiosk) - virt_viewer_notebook_show_status(nb, _("Waiting for display %d..."), nth + 1); + if (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_READY) { + win = ensure_window_for_display(self, display); + nb = virt_viewer_window_get_notebook(win); + virt_viewer_notebook_show_display(nb); + virt_viewer_window_show(win); + } else { + if (!self->priv->kiosk && win) { + nb = virt_viewer_window_get_notebook(win); + virt_viewer_notebook_show_status(nb, _("Waiting for display %d..."), nth + 1); + } + } } virt_viewer_app_update_menu_displays(self); - - g_object_unref(self); } static void @@ -850,47 +1017,51 @@ VirtViewerDisplay *display, VirtViewerApp *self) { - VirtViewerAppPrivate *priv = self->priv; - VirtViewerWindow *window; gint nth; g_object_get(display, "nth-display", &nth, NULL); - window = virt_viewer_app_get_nth_window(self, nth); - if (window == NULL) { - if (priv->kiosk) { - /* don't show extra monitors that don't fit on client */ - g_debug("kiosk mode: skip extra monitors that don't fit on client"); - return; - } - - window = virt_viewer_app_window_new(self, nth); - } - - virt_viewer_window_set_display(window, display); - virt_viewer_app_update_menu_displays(self); - virt_viewer_signal_connect_object(display, "notify::show-hint", - G_CALLBACK(display_show_hint), window, 0); + + g_debug("Insert display %d %p", nth, display); + g_hash_table_insert(self->priv->displays, GINT_TO_POINTER(nth), g_object_ref(display)); + + g_signal_connect(display, "notify::show-hint", + G_CALLBACK(display_show_hint), NULL); g_object_notify(G_OBJECT(display), "show-hint"); /* call display_show_hint */ } + +static void virt_viewer_app_remove_nth_window(VirtViewerApp *self, + gint nth) +{ + VirtViewerWindow *win = virt_viewer_app_get_nth_window(self, nth); + if (!win) + return; + virt_viewer_window_set_display(win, NULL); + if (win == self->priv->main_window) { + g_debug("Not removing main window %d %p", nth, win); + return; + } + virt_viewer_window_hide(win); + + g_debug("Remove window %d %p", nth, win); + self->priv->windows = g_list_remove(self->priv->windows, win); + + g_signal_emit(self, signals[SIGNAL_WINDOW_REMOVED], 0, win); + + g_object_unref(win); +} static void virt_viewer_app_display_removed(VirtViewerSession *session G_GNUC_UNUSED, VirtViewerDisplay *display, VirtViewerApp *self) { - VirtViewerWindow *win = NULL; gint nth; - gtk_widget_hide(GTK_WIDGET(display)); g_object_get(display, "nth-display", &nth, NULL); - win = virt_viewer_app_get_nth_window(self, nth); - if (!win) - return; - - virt_viewer_window_set_display(win, NULL); - if (nth != 0) - virt_viewer_app_remove_nth_window(self, nth); + virt_viewer_app_remove_nth_window(self, nth); + g_hash_table_remove(self->priv->displays, GINT_TO_POINTER(nth)); + virt_viewer_app_update_menu_displays(self); } static void @@ -916,13 +1087,13 @@ virt_viewer_update_smartcard_accels(VIRT_VIEWER_APP(user_data)); } -int -virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type) -{ - g_return_val_if_fail(VIRT_VIEWER_IS_APP(self), -1); +gboolean +virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type, GError **error) +{ + g_return_val_if_fail(VIRT_VIEWER_IS_APP(self), FALSE); VirtViewerAppPrivate *priv = self->priv; - g_return_val_if_fail(priv->session == NULL, -1); - g_return_val_if_fail(type != NULL, -1); + g_return_val_if_fail(priv->session == NULL, FALSE); + g_return_val_if_fail(type != NULL, FALSE); #ifdef HAVE_GTK_VNC if (g_ascii_strcasecmp(type, "vnc") == 0) { @@ -941,11 +1112,13 @@ } else #endif { + g_set_error(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Unsupported graphic type '%s'"), type); + virt_viewer_app_trace(self, "Guest %s has unsupported %s display type", priv->guest_name, type); - virt_viewer_app_simple_message_dialog(self, _("Unknown graphic type for the guest %s"), - priv->guest_name); - return -1; + return FALSE; } g_signal_connect(priv->session, "session-initialized", @@ -958,8 +1131,8 @@ G_CALLBACK(virt_viewer_app_channel_open), self); g_signal_connect(priv->session, "session-auth-refused", G_CALLBACK(virt_viewer_app_auth_refused), self); - g_signal_connect(priv->session, "session-auth-failed", - G_CALLBACK(virt_viewer_app_auth_failed), self); + g_signal_connect(priv->session, "session-auth-unsupported", + G_CALLBACK(virt_viewer_app_auth_unsupported), self); g_signal_connect(priv->session, "session-usb-failed", G_CALLBACK(virt_viewer_app_usb_failed), self); g_signal_connect(priv->session, "session-display-added", @@ -980,7 +1153,7 @@ g_signal_connect(priv->session, "notify::software-smartcard-reader", (GCallback)notify_software_reader_cb, self); - return 0; + return TRUE; } static gboolean @@ -1093,12 +1266,15 @@ } else if (priv->guri) { virt_viewer_app_trace(self, "Opening connection to display at %s", priv->guri); return virt_viewer_session_open_uri(VIRT_VIEWER_SESSION(priv->session), priv->guri, error); - } else { + } else if (priv->ghost) { virt_viewer_app_trace(self, "Opening direct TCP connection to display at %s:%s:%s", priv->ghost, priv->gport, priv->gtlsport ? priv->gtlsport : "-1"); return virt_viewer_session_open_host(VIRT_VIEWER_SESSION(priv->session), priv->ghost, priv->gport, priv->gtlsport); - } + } else { + g_set_error_literal(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Display can only be attached through libvirt with --attach")); + } return FALSE; } @@ -1213,40 +1389,6 @@ return FALSE; } -static gboolean -virt_viewer_app_connect_timer(void *opaque) -{ - VirtViewerApp *self = opaque; - VirtViewerAppPrivate *priv = self->priv; - - g_debug("Connect timer fired"); - - if (!priv->active && - virt_viewer_app_initial_connect(self, NULL) < 0) - gtk_main_quit(); - - if (priv->active) { - priv->reconnect_poll = 0; - return FALSE; - } - - return TRUE; -} - -void -virt_viewer_app_start_reconnect_poll(VirtViewerApp *self) -{ - g_return_if_fail(VIRT_VIEWER_IS_APP(self)); - VirtViewerAppPrivate *priv = self->priv; - - g_debug("reconnect_poll: %d", priv->reconnect_poll); - - if (priv->reconnect_poll != 0) - return; - - priv->reconnect_poll = g_timeout_add(500, virt_viewer_app_connect_timer, self); -} - static void virt_viewer_app_default_deactivated(VirtViewerApp *self, gboolean connect_error) { @@ -1360,35 +1502,22 @@ } -static void virt_viewer_app_auth_refused(VirtViewerSession *session G_GNUC_UNUSED, +static void virt_viewer_app_auth_refused(VirtViewerSession *session, const char *msg, VirtViewerApp *self) { - GtkWidget *dialog; - int ret; VirtViewerAppPrivate *priv = self->priv; - dialog = gtk_message_dialog_new(virt_viewer_window_get_window(priv->main_window), - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_YES_NO, - _("Unable to authenticate with remote desktop server at %s: %s\n" - "Retry connection again?"), - priv->pretty_address, msg); - - ret = gtk_dialog_run(GTK_DIALOG(dialog)); - - gtk_widget_destroy(dialog); - - if (ret == GTK_RESPONSE_YES) - priv->authretry = TRUE; - else - priv->authretry = FALSE; -} - - -static void virt_viewer_app_auth_failed(VirtViewerSession *session G_GNUC_UNUSED, + virt_viewer_app_simple_message_dialog(self, + _("Unable to authenticate with remote desktop server at %s: %s\n"), + priv->pretty_address, msg); + + /* if the session implementation cannot retry auth automatically, the + * VirtViewerApp needs to schedule a new connection to retry */ + priv->authretry = !virt_viewer_session_can_retry_auth(session); +} + +static void virt_viewer_app_auth_unsupported(VirtViewerSession *session G_GNUC_UNUSED, const char *msg, VirtViewerApp *self) { @@ -1408,6 +1537,7 @@ virt_viewer_app_set_kiosk(VirtViewerApp *self, gboolean enabled) { int i; + GList *l; self->priv->kiosk = enabled; if (!enabled) @@ -1415,11 +1545,14 @@ virt_viewer_app_set_fullscreen(self, enabled); - for (i = 0; i < gdk_screen_get_n_monitors(gdk_screen_get_default()); i++) { - VirtViewerWindow *win = virt_viewer_app_get_nth_window(self, i); - - if (win == NULL) - win = virt_viewer_app_window_new(self, i); + /* create windows for each client monitor */ + for (i = g_list_length(self->priv->windows); + i < get_n_client_monitors(); i++) { + virt_viewer_app_window_new(self, i); + } + + for (l = self->priv->windows; l != NULL; l = l ->next) { + VirtViewerWindow *win = l->data; virt_viewer_window_show(win); virt_viewer_window_set_kiosk(win, enabled); @@ -1474,6 +1607,10 @@ case PROP_QUIT_ON_DISCONNECT: g_value_set_boolean(value, priv->quit_on_disconnect); + break; + + case PROP_UUID: + g_value_set_string(value, priv->uuid); break; default: @@ -1526,6 +1663,10 @@ priv->quit_on_disconnect = g_value_get_boolean(value); break; + case PROP_UUID: + virt_viewer_app_set_uuid_string(self, g_value_get_string(value)); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -1537,13 +1678,26 @@ VirtViewerApp *self = VIRT_VIEWER_APP(object); VirtViewerAppPrivate *priv = self->priv; + if (priv->preferences) + gtk_widget_destroy(priv->preferences); + priv->preferences = NULL; + if (priv->windows) { - GHashTable *tmp = priv->windows; + GList *tmp = priv->windows; /* null-ify before unrefing, because we need * to prevent callbacks using priv->windows * while it is being disposed off. */ priv->windows = NULL; priv->main_window = NULL; + g_list_free_full(tmp, g_object_unref); + } + + if (priv->displays) { + GHashTable *tmp = priv->displays; + /* null-ify before unrefing, because we need + * to prevent callbacks using priv->displays + * while it is being disposed of. */ + priv->displays = NULL; g_hash_table_unref(tmp); } @@ -1558,10 +1712,12 @@ priv->guri = NULL; g_free(priv->title); priv->title = NULL; + g_free(priv->uuid); + priv->uuid = NULL; g_free(priv->config_file); priv->config_file = NULL; g_clear_pointer(&priv->config, g_key_file_free); - g_clear_pointer(&priv->initial_display_map, g_array_unref); + g_clear_pointer(&priv->initial_display_map, g_hash_table_unref); virt_viewer_app_free_connect_info(self); @@ -1569,13 +1725,13 @@ } static gboolean -virt_viewer_app_default_start(VirtViewerApp *self) +virt_viewer_app_default_start(VirtViewerApp *self, GError **error G_GNUC_UNUSED) { virt_viewer_window_show(self->priv->main_window); return TRUE; } -gboolean virt_viewer_app_start(VirtViewerApp *self) +gboolean virt_viewer_app_start(VirtViewerApp *self, GError **error) { VirtViewerAppClass *klass; @@ -1584,11 +1740,11 @@ g_return_val_if_fail(!self->priv->started, TRUE); - self->priv->started = klass->start(self); + self->priv->started = klass->start(self, error); return self->priv->started; } -static int opt_zoom = 100; +static int opt_zoom = NORMAL_ZOOM_LEVEL; static gchar *opt_hotkeys = NULL; static gboolean opt_verbose = FALSE; static gboolean opt_debug = FALSE; @@ -1603,21 +1759,19 @@ } static void -virt_viewer_app_init (VirtViewerApp *self) +virt_viewer_app_init(VirtViewerApp *self) { GError *error = NULL; + self->priv = GET_PRIVATE(self); gtk_window_set_default_icon_name("virt-viewer"); virt_viewer_app_set_debug(opt_debug); - - self->priv = GET_PRIVATE(self); - self->priv->windows = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_object_unref); + virt_viewer_app_set_fullscreen(self, opt_fullscreen); + + self->priv->displays = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_object_unref); self->priv->config = g_key_file_new(); self->priv->config_file = g_build_filename(g_get_user_config_dir(), "virt-viewer", "settings", NULL); - self->priv->main_window = virt_viewer_app_window_new(self, 0); - self->priv->main_notebook = GTK_WIDGET(virt_viewer_window_get_notebook(self->priv->main_window)); - g_key_file_load_from_file(self->priv->config, self->priv->config_file, G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, &error); @@ -1630,16 +1784,15 @@ if (opt_zoom < MIN_ZOOM_LEVEL || opt_zoom > MAX_ZOOM_LEVEL) { g_printerr(_("Zoom level must be within %d-%d\n"), MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL); - opt_zoom = 100; - } - + opt_zoom = NORMAL_ZOOM_LEVEL; + } + + self->priv->initial_display_map = virt_viewer_app_get_monitor_mapping_for_section(self, "fallback"); self->priv->verbose = opt_verbose; self->priv->quit_on_disconnect = opt_kiosk ? opt_kiosk_quit : TRUE; g_signal_connect(self, "notify::guest-name", G_CALLBACK(title_maybe_changed), NULL); g_signal_connect(self, "notify::title", G_CALLBACK(title_maybe_changed), NULL); g_signal_connect(self, "notify::guri", G_CALLBACK(title_maybe_changed), NULL); - - virt_viewer_window_set_zoom_level(self->priv->main_window, opt_zoom); } static void @@ -1694,16 +1847,18 @@ } } -static GObject * -virt_viewer_app_constructor (GType gtype, - guint n_properties, - GObjectConstructParam *properties) -{ - GObject *obj; - VirtViewerApp *self; - - obj = G_OBJECT_CLASS (virt_viewer_app_parent_class)->constructor (gtype, n_properties, properties); - self = VIRT_VIEWER_APP(obj); +static void +virt_viewer_app_constructed(GObject *object) +{ + VirtViewerApp *self = VIRT_VIEWER_APP(object); + + self->priv->main_window = virt_viewer_app_window_new(self, + virt_viewer_app_get_first_monitor(self)); + self->priv->main_notebook = GTK_WIDGET(virt_viewer_window_get_notebook(self->priv->main_window)); + + virt_viewer_app_set_kiosk(self, opt_kiosk); + virt_viewer_app_set_hotkeys(self, opt_hotkeys); + virt_viewer_window_set_zoom_level(self->priv->main_window, opt_zoom); virt_viewer_set_insert_smartcard_accel(self, GDK_F8, GDK_SHIFT_MASK); virt_viewer_set_remove_smartcard_accel(self, GDK_F9, GDK_SHIFT_MASK); @@ -1713,12 +1868,6 @@ gtk_accel_map_add_entry("/view/zoom-out", GDK_minus, GDK_CONTROL_MASK); gtk_accel_map_add_entry("/view/zoom-in", GDK_plus, GDK_CONTROL_MASK); gtk_accel_map_add_entry("/send/secure-attention", GDK_End, GDK_CONTROL_MASK | GDK_MOD1_MASK); - - virt_viewer_app_set_fullscreen(self, opt_fullscreen); - virt_viewer_app_set_hotkeys(self, opt_hotkeys); - virt_viewer_app_set_kiosk(self, opt_kiosk); - - return obj; } static void @@ -1728,7 +1877,7 @@ g_type_class_add_private (klass, sizeof (VirtViewerAppPrivate)); - object_class->constructor = virt_viewer_app_constructor; + object_class->constructed = virt_viewer_app_constructed; object_class->get_property = virt_viewer_app_get_property; object_class->set_property = virt_viewer_app_set_property; object_class->dispose = virt_viewer_app_dispose; @@ -1833,6 +1982,16 @@ TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, + PROP_UUID, + g_param_spec_string("uuid", + "uuid", + "uuid", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS)); signals[SIGNAL_WINDOW_ADDED] = g_signal_new("window-added", @@ -1910,7 +2069,6 @@ } virt_viewer_app_clear_hotkeys(self); - virt_viewer_app_set_enable_accel(self, TRUE); for (hotkey = hotkeys; *hotkey != NULL; hotkey++) { gchar *key = strstr(*hotkey, "="); @@ -1942,6 +2100,7 @@ } g_strfreev(hotkeys); + virt_viewer_app_set_enable_accel(self, TRUE); virt_viewer_update_smartcard_accels(self); } @@ -1998,15 +2157,20 @@ gboolean fullscreen; } FullscreenOptions; -static void fullscreen_cb(gpointer key, - gpointer value, +static void fullscreen_cb(gpointer value, gpointer user_data) { FullscreenOptions *options = (FullscreenOptions *)user_data; - gint nth = virt_viewer_app_get_initial_monitor_for_display(options->app, *(gint*)key); + gint nth = 0; VirtViewerWindow *vwin = VIRT_VIEWER_WINDOW(value); - + VirtViewerDisplay *display = virt_viewer_window_get_display(vwin); + + /* At startup, the main window will not yet have an associated display, so + * assume that it's the first display */ + if (display) + nth = virt_viewer_display_get_nth(display); g_debug("fullscreen display %d: %d", nth, options->fullscreen); + if (options->fullscreen) app_window_try_fullscreen(options->app, vwin, nth); else @@ -2032,40 +2196,43 @@ /* we iterate unconditionnaly, even if it was set before to update new windows */ priv->fullscreen = fullscreen; - g_hash_table_foreach(priv->windows, fullscreen_cb, &options); + g_list_foreach(priv->windows, fullscreen_cb, &options); g_object_notify(G_OBJECT(self), "fullscreen"); } static void menu_display_visible_toggled_cb(GtkCheckMenuItem *checkmenuitem, - VirtViewerWindow *vwin) -{ - VirtViewerApp *self; - gboolean visible; + VirtViewerDisplay *display) +{ + VirtViewerApp *self = virt_viewer_session_get_app(virt_viewer_display_get_session(display)); + gboolean visible = gtk_check_menu_item_get_active(checkmenuitem); static gboolean reentering = FALSE; + VirtViewerWindow *vwin; if (reentering) /* do not reenter if I switch you back */ return; reentering = TRUE; - g_object_get(vwin, "app", &self, NULL); - visible = virt_viewer_app_window_set_visible(self, vwin, - gtk_check_menu_item_get_active(checkmenuitem)); + + vwin = ensure_window_for_display(self, display); + visible = virt_viewer_app_window_set_visible(self, vwin, visible); + gtk_check_menu_item_set_active(checkmenuitem, /* will be toggled again */ !visible); - g_object_unref(self); reentering = FALSE; + + virt_viewer_session_update_displays_geometry(virt_viewer_display_get_session(display)); } static gint update_menu_displays_sort(gconstpointer a, gconstpointer b) { - const int *ai = a; - const int *bi = b; - - if (*ai > *bi) + const int ai = GPOINTER_TO_INT(a); + const int bi = GPOINTER_TO_INT(b); + + if (ai > bi) return 1; - else if (*ai < *bi) + else if (ai < bi) return -1; else return 0; @@ -2102,32 +2269,35 @@ } static void -window_update_menu_displays_cb(gpointer key G_GNUC_UNUSED, - gpointer value, +window_update_menu_displays_cb(gpointer value, gpointer user_data) { VirtViewerApp *self = VIRT_VIEWER_APP(user_data); GtkMenuShell *submenu; - GList *keys = g_hash_table_get_keys(self->priv->windows); + GList *keys = g_hash_table_get_keys(self->priv->displays); GList *tmp; + gboolean sensitive; keys = g_list_sort(keys, update_menu_displays_sort); submenu = window_empty_display_submenu(VIRT_VIEWER_WINDOW(value)); + sensitive = (keys != NULL); + virt_viewer_window_set_menu_displays_sensitive(VIRT_VIEWER_WINDOW(value), sensitive); + tmp = keys; while (tmp) { - int *nth = tmp->data; - VirtViewerWindow *vwin = VIRT_VIEWER_WINDOW(g_hash_table_lookup(self->priv->windows, nth)); - VirtViewerDisplay *display = virt_viewer_window_get_display(vwin); + int nth = GPOINTER_TO_INT(tmp->data); + VirtViewerWindow *vwin = virt_viewer_app_get_nth_window(self, nth); + VirtViewerDisplay *display = VIRT_VIEWER_DISPLAY(g_hash_table_lookup(self->priv->displays, tmp->data)); GtkWidget *item; - gboolean visible, sensitive; + gboolean visible; gchar *label; - label = g_strdup_printf(_("Display %d"), *nth + 1); + label = g_strdup_printf(_("Display %d"), nth + 1); item = gtk_check_menu_item_new_with_label(label); g_free(label); - visible = gtk_widget_get_visible(GTK_WIDGET(virt_viewer_window_get_window(vwin))); + visible = vwin && gtk_widget_get_visible(GTK_WIDGET(virt_viewer_window_get_window(vwin))); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), visible); sensitive = visible; @@ -2142,8 +2312,8 @@ } gtk_widget_set_sensitive(item, sensitive); - g_signal_connect(G_OBJECT(item), - "toggled", G_CALLBACK(menu_display_visible_toggled_cb), vwin); + virt_viewer_signal_connect_object(G_OBJECT(item), "toggled", + G_CALLBACK(menu_display_visible_toggled_cb), display, 0); gtk_menu_shell_append(submenu, item); tmp = tmp->next; } @@ -2157,7 +2327,7 @@ { if (!self->priv->windows) return; - g_hash_table_foreach(self->priv->windows, window_update_menu_displays_cb, self); + g_list_foreach(self->priv->windows, window_update_menu_displays_cb, self); } void @@ -2176,7 +2346,7 @@ VirtViewerAppPrivate *priv = self->priv; g_debug("Set connect info: %s,%s,%s,%s,%s,%s,%s,%d", - host, ghost, gport, gtlsport ? gtlsport : "-1", transport, unixsock, user, port); + host, ghost, gport ? gport : "-1", gtlsport ? gtlsport : "-1", transport, unixsock, user, port); g_free(priv->host); g_free(priv->ghost); @@ -2217,8 +2387,7 @@ } static void -show_status_cb(gpointer key G_GNUC_UNUSED, - gpointer value, +show_status_cb(gpointer value, gpointer user_data) { VirtViewerNotebook *nb = virt_viewer_window_get_notebook(VIRT_VIEWER_WINDOW(value)); @@ -2240,13 +2409,12 @@ text = g_strdup_vprintf(fmt, args); va_end(args); - g_hash_table_foreach(self->priv->windows, show_status_cb, text); + g_list_foreach(self->priv->windows, show_status_cb, text); g_free(text); } static void -show_display_cb(gpointer key G_GNUC_UNUSED, - gpointer value, +show_display_cb(gpointer value, gpointer user_data G_GNUC_UNUSED) { VirtViewerNotebook *nb = virt_viewer_window_get_notebook(VIRT_VIEWER_WINDOW(value)); @@ -2258,7 +2426,7 @@ virt_viewer_app_show_display(VirtViewerApp *self) { g_return_if_fail(VIRT_VIEWER_IS_APP(self)); - g_hash_table_foreach(self->priv->windows, show_display_cb, self); + g_list_foreach(self->priv->windows, show_display_cb, self); } gboolean @@ -2277,11 +2445,94 @@ return self->priv->session; } -GHashTable* +GList* virt_viewer_app_get_windows(VirtViewerApp *self) { g_return_val_if_fail(VIRT_VIEWER_IS_APP(self), NULL); return self->priv->windows; +} + +static void +share_folder_changed(VirtViewerApp *self) +{ + gchar *folder; + + folder = gtk_file_chooser_get_filename(self->priv->preferences_shared_folder); + + g_object_set(virt_viewer_app_get_session(self), + "shared-folder", folder, NULL); + + g_free(folder); +} + +static GtkWidget * +virt_viewer_app_get_preferences(VirtViewerApp *self) +{ + VirtViewerSession *session = virt_viewer_app_get_session(self); + GtkBuilder *builder = virt_viewer_util_load_ui("virt-viewer-preferences.xml"); + gboolean can_share_folder = virt_viewer_session_can_share_folder(session); + GtkWidget *preferences = self->priv->preferences; + gchar *path; + + if (preferences) + goto end; + + gtk_builder_connect_signals(builder, self); + + preferences = GTK_WIDGET(gtk_builder_get_object(builder, "preferences")); + self->priv->preferences = preferences; + + g_object_set (gtk_builder_get_object(builder, "cbsharefolder"), + "sensitive", can_share_folder, NULL); + g_object_set (gtk_builder_get_object(builder, "cbsharefolderro"), + "sensitive", can_share_folder, NULL); + g_object_set (gtk_builder_get_object(builder, "fcsharefolder"), + "sensitive", can_share_folder, NULL); + + if (!can_share_folder) + goto end; + + g_object_bind_property(virt_viewer_app_get_session(self), + "share-folder", + gtk_builder_get_object(builder, "cbsharefolder"), + "active", + G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); + + g_object_bind_property(virt_viewer_app_get_session(self), + "share-folder-ro", + gtk_builder_get_object(builder, "cbsharefolderro"), + "active", + G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); + + self->priv->preferences_shared_folder = + GTK_FILE_CHOOSER(gtk_builder_get_object(builder, "fcsharefolder")); + + g_object_get(virt_viewer_app_get_session(self), + "shared-folder", &path, NULL); + + gtk_file_chooser_set_filename(self->priv->preferences_shared_folder, path); + g_free(path); + + virt_viewer_signal_connect_object(self->priv->preferences_shared_folder, + "file-set", + G_CALLBACK(share_folder_changed), self, + G_CONNECT_SWAPPED); + +end: + g_object_unref(builder); + + return preferences; +} + +void +virt_viewer_app_show_preferences(VirtViewerApp *self, GtkWidget *parent) +{ + GtkWidget *preferences = virt_viewer_app_get_preferences(self); + + gtk_window_set_transient_for(GTK_WINDOW(preferences), + GTK_WINDOW(parent)); + + gtk_window_present(GTK_WINDOW(preferences)); } static gboolean @@ -2329,6 +2580,11 @@ return group; } +gboolean virt_viewer_app_get_session_cancelled(VirtViewerApp *self) +{ + return self->priv->cancelled; +} + /* * Local variables: * c-indent-level: 4 diff --git a/src/virt-viewer-app.h b/src/virt-viewer-app.h index f953a1e..bbbc9b4 100644 --- a/src/virt-viewer-app.h +++ b/src/virt-viewer-app.h @@ -51,7 +51,7 @@ void (*window_removed) (VirtViewerApp *self, VirtViewerWindow *window); /*< private >*/ - gboolean (*start) (VirtViewerApp *self); + gboolean (*start) (VirtViewerApp *self, GError **error); gboolean (*initial_connect) (VirtViewerApp *self, GError **error); gboolean (*activate) (VirtViewerApp *self, GError **error); void (*deactivated) (VirtViewerApp *self, gboolean connect_error); @@ -61,17 +61,16 @@ GType virt_viewer_app_get_type (void); void virt_viewer_app_set_debug(gboolean debug); -gboolean virt_viewer_app_start(VirtViewerApp *app); +gboolean virt_viewer_app_start(VirtViewerApp *app, GError **error); void virt_viewer_app_maybe_quit(VirtViewerApp *self, VirtViewerWindow *window); VirtViewerWindow* virt_viewer_app_get_main_window(VirtViewerApp *self); void virt_viewer_app_trace(VirtViewerApp *self, const char *fmt, ...); void virt_viewer_app_simple_message_dialog(VirtViewerApp *self, const char *fmt, ...); gboolean virt_viewer_app_is_active(VirtViewerApp *app); void virt_viewer_app_free_connect_info(VirtViewerApp *self); -int virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type); +gboolean virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type, GError **error); gboolean virt_viewer_app_activate(VirtViewerApp *self, GError **error); gboolean virt_viewer_app_initial_connect(VirtViewerApp *self, GError **error); -void virt_viewer_app_start_reconnect_poll(VirtViewerApp *self); void virt_viewer_app_set_zoom_level(VirtViewerApp *self, gint zoom_level); gboolean virt_viewer_app_get_direct(VirtViewerApp *self); void virt_viewer_app_set_direct(VirtViewerApp *self, gboolean direct); @@ -92,16 +91,18 @@ gboolean virt_viewer_app_window_set_visible(VirtViewerApp *self, VirtViewerWindow *window, gboolean visible); void virt_viewer_app_show_status(VirtViewerApp *self, const gchar *fmt, ...); void virt_viewer_app_show_display(VirtViewerApp *self); -GHashTable* virt_viewer_app_get_windows(VirtViewerApp *self); +GList* virt_viewer_app_get_windows(VirtViewerApp *self); gboolean virt_viewer_app_get_enable_accel(VirtViewerApp *self); VirtViewerSession* virt_viewer_app_get_session(VirtViewerApp *self); gboolean virt_viewer_app_get_fullscreen(VirtViewerApp *app); GOptionGroup* virt_viewer_app_get_option_group(void); void virt_viewer_app_clear_hotkeys(VirtViewerApp *app); -gint virt_viewer_app_get_n_initial_displays(VirtViewerApp* self); +GList* virt_viewer_app_get_initial_displays(VirtViewerApp* self); gint virt_viewer_app_get_initial_monitor_for_display(VirtViewerApp* self, gint display); -void virt_viewer_app_set_uuid_string(VirtViewerApp* self, const gchar* uuid_string); void virt_viewer_app_set_enable_accel(VirtViewerApp *app, gboolean enable); +void virt_viewer_app_show_preferences(VirtViewerApp *app, GtkWidget *parent); +void virt_viewer_app_set_menus_sensitive(VirtViewerApp *self, gboolean sensitive); +gboolean virt_viewer_app_get_session_cancelled(VirtViewerApp *self); G_END_DECLS diff --git a/src/virt-viewer-auth.c b/src/virt-viewer-auth.c index a5b6393..d08f2c0 100644 --- a/src/virt-viewer-auth.c +++ b/src/virt-viewer-auth.c @@ -23,6 +23,7 @@ #include #include +#include #include #ifdef HAVE_GTK_VNC @@ -31,8 +32,18 @@ #include "virt-viewer-auth.h" +static void +show_password(GtkCheckButton *check_button G_GNUC_UNUSED, + GtkEntry *entry) +{ + gtk_entry_set_visibility(entry, !gtk_entry_get_visibility(entry)); +} -int +/* NOTE: if username is provided, and *username is non-NULL, the user input + * field will be pre-filled with this value. The existing string will be freed + * before setting the output parameter to the user-entered value. + */ +gboolean virt_viewer_auth_collect_credentials(GtkWindow *window, const char *type, const char *address, @@ -46,6 +57,7 @@ GtkWidget *promptUsername; GtkWidget *promptPassword; GtkWidget *labelMessage; + GtkWidget *checkPassword; int response; char *message; @@ -58,19 +70,26 @@ promptUsername = GTK_WIDGET(gtk_builder_get_object(creds, "prompt-username")); credPassword = GTK_WIDGET(gtk_builder_get_object(creds, "cred-password")); promptPassword = GTK_WIDGET(gtk_builder_get_object(creds, "prompt-password")); + checkPassword = GTK_WIDGET(gtk_builder_get_object(creds, "show-password")); gtk_widget_set_sensitive(credUsername, username != NULL); + if (username && *username) { + gtk_entry_set_text(GTK_ENTRY(credUsername), *username); + /* if username is pre-filled, move focus to password field */ + gtk_widget_grab_focus(credPassword); + } gtk_widget_set_sensitive(promptUsername, username != NULL); gtk_widget_set_sensitive(credPassword, password != NULL); gtk_widget_set_sensitive(promptPassword, password != NULL); + g_signal_connect(checkPassword, "clicked", G_CALLBACK(show_password), credPassword); + if (address) { - message = g_strdup_printf("Authentication is required for the %s connection to:\n\n" - "%s\n\n", + message = g_strdup_printf(_("Authentication is required for the %s connection to:\n\n%s\n\n"), type, address); } else { - message = g_strdup_printf("Authentication is required for the %s connection:\n", + message = g_strdup_printf(_("Authentication is required for the %s connection:\n"), type); } @@ -82,8 +101,10 @@ gtk_widget_hide(dialog); if (response == GTK_RESPONSE_OK) { - if (username) + if (username) { + g_free(*username); *username = g_strdup(gtk_entry_get_text(GTK_ENTRY(credUsername))); + } if (password) *password = g_strdup(gtk_entry_get_text(GTK_ENTRY(credPassword))); } @@ -91,7 +112,7 @@ gtk_widget_destroy(GTK_WIDGET(dialog)); g_object_unref(G_OBJECT(creds)); - return response == GTK_RESPONSE_OK ? 0 : -1; + return response == GTK_RESPONSE_OK; } /* diff --git a/src/virt-viewer-auth.h b/src/virt-viewer-auth.h index ad932c5..85e3bbc 100644 --- a/src/virt-viewer-auth.h +++ b/src/virt-viewer-auth.h @@ -32,11 +32,11 @@ #include "virt-viewer-session.h" #include "virt-viewer-util.h" -int virt_viewer_auth_collect_credentials(GtkWindow *window, - const char *type, - const char *address, - char **username, - char **password); +gboolean virt_viewer_auth_collect_credentials(GtkWindow *window, + const char *type, + const char *address, + char **username, + char **password); #endif /* diff --git a/src/virt-viewer-auth.xml b/src/virt-viewer-auth.xml index 0da1181..d307754 100644 --- a/src/virt-viewer-auth.xml +++ b/src/virt-viewer-auth.xml @@ -129,6 +129,20 @@ 2 + + + True + True + False + Show password + + + 1 + 2 + 2 + 3 + + False diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c index 2ce42cf..c3dbd75 100644 --- a/src/virt-viewer-display-spice.c +++ b/src/virt-viewer-display-spice.c @@ -45,6 +45,8 @@ SpiceChannel *channel; /* weak reference */ SpiceDisplay *display; AutoResizeState auto_resize; + guint x; + guint y; }; #define VIRT_VIEWER_DISPLAY_SPICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), VIRT_VIEWER_TYPE_DISPLAY_SPICE, VirtViewerDisplaySpicePrivate)) @@ -56,30 +58,21 @@ static void virt_viewer_display_spice_release_cursor(VirtViewerDisplay *display); static void virt_viewer_display_spice_close(VirtViewerDisplay *display G_GNUC_UNUSED); static gboolean virt_viewer_display_spice_selectable(VirtViewerDisplay *display); - -static void -virt_viewer_display_spice_finalize(GObject *obj) -{ - VirtViewerDisplaySpice *spice = VIRT_VIEWER_DISPLAY_SPICE(obj); - - g_object_unref(spice->priv->display); - - G_OBJECT_CLASS(virt_viewer_display_spice_parent_class)->finalize(obj); -} +static void virt_viewer_display_spice_enable(VirtViewerDisplay *display); +static void virt_viewer_display_spice_disable(VirtViewerDisplay *display); static void virt_viewer_display_spice_class_init(VirtViewerDisplaySpiceClass *klass) { VirtViewerDisplayClass *dclass = VIRT_VIEWER_DISPLAY_CLASS(klass); - GObjectClass *oclass = G_OBJECT_CLASS(klass); - - oclass->finalize = virt_viewer_display_spice_finalize; dclass->send_keys = virt_viewer_display_spice_send_keys; dclass->get_pixbuf = virt_viewer_display_spice_get_pixbuf; dclass->release_cursor = virt_viewer_display_spice_release_cursor; dclass->close = virt_viewer_display_spice_close; dclass->selectable = virt_viewer_display_spice_selectable; + dclass->enable = virt_viewer_display_spice_enable; + dclass->disable = virt_viewer_display_spice_disable; g_type_class_add_private(klass, sizeof(VirtViewerDisplaySpicePrivate)); } @@ -100,11 +93,9 @@ g_signal_emit_by_name(self, "monitor-geometry-changed", NULL); } -static void -show_hint_changed(VirtViewerDisplay *self) +static void update_enabled(VirtViewerDisplay *self, gboolean enabled, gboolean send) { SpiceMainChannel *main_channel = get_main(self); - guint enabled = virt_viewer_display_get_enabled(self); guint nth; /* this may happen when finalizing */ @@ -112,7 +103,26 @@ return; g_object_get(self, "nth-display", &nth, NULL); - spice_main_set_display_enabled(main_channel, nth, enabled); + spice_main_update_display_enabled(main_channel, nth, enabled, send); +} + +static void +show_hint_changed(VirtViewerDisplay *self) +{ + /* just keep spice-gtk state up-to-date, but don't send change anything */ + update_enabled(self, virt_viewer_display_get_enabled(self), FALSE); +} + +static void virt_viewer_display_spice_enable(VirtViewerDisplay *self) +{ + virt_viewer_display_set_enabled(self, TRUE); + update_enabled(self, TRUE, TRUE); +} + +static void virt_viewer_display_spice_disable(VirtViewerDisplay *self) +{ + virt_viewer_display_set_enabled(self, FALSE); + update_enabled(self, FALSE, TRUE); } static void @@ -189,26 +199,25 @@ gpointer data G_GNUC_UNUSED) { GtkRequisition preferred; - guint hint = virt_viewer_display_get_show_hint(VIRT_VIEWER_DISPLAY(self)); - - if (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_READY) - { - /* ignore all allocations before the widget gets mapped to screen since we - * only want to trigger guest resizing due to user actions - */ - if (!gtk_widget_get_mapped(GTK_WIDGET(self))) - return; - - /* when the window gets resized due to a change in zoom level, we don't want - * to re-size the guest display. So if we get an allocation event that - * resizes the window to the size it already wants to be (based on desktop - * size and zoom level), just return early - */ - virt_viewer_display_get_preferred_size(VIRT_VIEWER_DISPLAY(self), &preferred); - if (preferred.width == allocation->width - && preferred.height == allocation->height) { - return; - } + + if (!virt_viewer_display_get_enabled(VIRT_VIEWER_DISPLAY(self))) + return; + + /* ignore all allocations before the widget gets mapped to screen since we + * only want to trigger guest resizing due to user actions + */ + if (!gtk_widget_get_mapped(GTK_WIDGET(self))) + return; + + /* when the window gets resized due to a change in zoom level, we don't want + * to re-size the guest display. So if we get an allocation event that + * resizes the window to the size it already wants to be (based on desktop + * size and zoom level), just return early + */ + virt_viewer_display_get_preferred_size(VIRT_VIEWER_DISPLAY(self), &preferred); + if (preferred.width == allocation->width + && preferred.height == allocation->height) { + return; } if (self->priv->auto_resize != AUTO_RESIZE_NEVER) @@ -298,7 +307,7 @@ G_CONNECT_SWAPPED); update_display_ready(self); - gtk_container_add(GTK_CONTAINER(self), g_object_ref(self->priv->display)); + gtk_container_add(GTK_CONTAINER(self), GTK_WIDGET(self->priv->display)); gtk_widget_show(GTK_WIDGET(self->priv->display)); g_object_set(self->priv->display, "grab-keyboard", TRUE, @@ -356,6 +365,31 @@ return agent_connected; } +void +virt_viewer_display_spice_set_desktop(VirtViewerDisplay *display, + guint x, guint y, + guint width, guint height) +{ + VirtViewerDisplaySpicePrivate *priv; + guint desktopWidth, desktopHeight; + + g_return_if_fail(VIRT_VIEWER_IS_DISPLAY_SPICE(display)); + + virt_viewer_display_get_desktop_size(display, &desktopWidth, &desktopHeight); + + priv = VIRT_VIEWER_DISPLAY_SPICE(display)->priv; + + if (desktopWidth == width && desktopHeight == height && priv->x == x && priv->y == y) + return; + + g_object_set(G_OBJECT(display), "desktop-width", width, "desktop-height", height, NULL); + priv->x = x; + priv->y = y; + + virt_viewer_display_queue_resize(display); + + g_signal_emit_by_name(display, "display-desktop-resize"); +} /* * Local variables: diff --git a/src/virt-viewer-display-spice.h b/src/virt-viewer-display-spice.h index c2013ec..3c30270 100644 --- a/src/virt-viewer-display-spice.h +++ b/src/virt-viewer-display-spice.h @@ -68,6 +68,8 @@ GtkWidget* virt_viewer_display_spice_new(VirtViewerSessionSpice *session, SpiceChannel *channel, gint monitorid); +void virt_viewer_display_spice_set_desktop(VirtViewerDisplay *display, guint x, guint y, + guint width, guint height); G_END_DECLS #endif /* _VIRT_VIEWER_DISPLAY_SPICE_H */ diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c index 8bf7b80..9e7ac63 100644 --- a/src/virt-viewer-display-vnc.c +++ b/src/virt-viewer-display-vnc.c @@ -116,8 +116,28 @@ virt_viewer_display_vnc_initialized(VncDisplay *vnc G_GNUC_UNUSED, VirtViewerDisplay *display) { + gchar *name = NULL; + gchar *uuid = NULL; + + VirtViewerSession *session = virt_viewer_display_get_session(display); + VirtViewerApp *app = virt_viewer_session_get_app(session); + + g_object_get(app, "guest-name", &name, "uuid", &uuid, NULL); + if (name == NULL || *name == '\0') { + const gchar * vnc_name = vnc_display_get_name(vnc); + if (vnc_name != NULL) { + g_object_set(app, "guest-name", vnc_name, NULL); + } + } + if (uuid == NULL || *uuid == '\0') { + g_object_set(app, "uuid", _("VNC does not provide GUID"), NULL); + } + virt_viewer_display_set_show_hint(display, VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, TRUE); + + g_free(name); + g_free(uuid); } static void @@ -165,11 +185,12 @@ GtkWidget * -virt_viewer_display_vnc_new(VncDisplay *vnc) +virt_viewer_display_vnc_new(VirtViewerSessionVnc *session, + VncDisplay *vnc) { VirtViewerDisplayVnc *display; - display = g_object_new(VIRT_VIEWER_TYPE_DISPLAY_VNC, NULL); + display = g_object_new(VIRT_VIEWER_TYPE_DISPLAY_VNC, "session", session, NULL); g_object_ref(vnc); display->priv->vnc = vnc; diff --git a/src/virt-viewer-display-vnc.h b/src/virt-viewer-display-vnc.h index 7020437..0b50563 100644 --- a/src/virt-viewer-display-vnc.h +++ b/src/virt-viewer-display-vnc.h @@ -28,6 +28,7 @@ #include #include "virt-viewer-display.h" +#include "virt-viewer-session-vnc.h" G_BEGIN_DECLS @@ -64,7 +65,7 @@ GType virt_viewer_display_vnc_get_type(void); -GtkWidget* virt_viewer_display_vnc_new(VncDisplay *display); +GtkWidget* virt_viewer_display_vnc_new(VirtViewerSessionVnc *session, VncDisplay *display); G_END_DECLS diff --git a/src/virt-viewer-display.c b/src/virt-viewer-display.c index e91450f..d8b3312 100644 --- a/src/virt-viewer-display.c +++ b/src/virt-viewer-display.c @@ -38,7 +38,7 @@ { #if !GTK_CHECK_VERSION(3, 0, 0) gboolean dirty; - gboolean mapped_once; + gboolean size_request_once; #endif guint desktopWidth; guint desktopHeight; @@ -54,7 +54,6 @@ #if !GTK_CHECK_VERSION(3, 0, 0) static void virt_viewer_display_size_request(GtkWidget *widget, GtkRequisition *requisition); -static void virt_viewer_display_map(GtkWidget *widget); #else static void virt_viewer_display_get_preferred_width(GtkWidget *widget, int *minwidth, @@ -106,7 +105,6 @@ widget_class->get_preferred_height = virt_viewer_display_get_preferred_height; #else widget_class->size_request = virt_viewer_display_size_request; - widget_class->map = virt_viewer_display_map; #endif widget_class->size_allocate = virt_viewer_display_size_allocate; widget_class->grab_focus = virt_viewer_display_grab_focus; @@ -146,7 +144,7 @@ "Zoom level", MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL, - 100, + NORMAL_ZOOM_LEVEL, G_PARAM_READWRITE)); g_object_class_install_property(object_class, @@ -278,10 +276,11 @@ display->priv->desktopWidth = 100; display->priv->desktopHeight = 100; - display->priv->zoom_level = 100; + display->priv->zoom_level = NORMAL_ZOOM_LEVEL; display->priv->zoom = TRUE; #if !GTK_CHECK_VERSION(3, 0, 0) display->priv->dirty = TRUE; + display->priv->size_request_once = FALSE; #endif } @@ -394,8 +393,8 @@ requisition->height = border_width * 2; if (priv->zoom) { - requisition->width += round(priv->desktopWidth * priv->zoom_level / 100.0); - requisition->height += round(priv->desktopHeight * priv->zoom_level / 100.0); + requisition->width += round(priv->desktopWidth * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); + requisition->height += round(priv->desktopHeight * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); } else { requisition->width += priv->desktopWidth; requisition->height += priv->desktopHeight; @@ -423,13 +422,14 @@ VirtViewerDisplay *display = VIRT_VIEWER_DISPLAY(widget); VirtViewerDisplayPrivate *priv = display->priv; - if (priv->dirty) { + if (priv->dirty || !priv->size_request_once) { virt_viewer_display_get_preferred_size(display, requisition); } else { - requisition->width = 50; - requisition->height = 50; - } - + requisition->width = MIN_DISPLAY_WIDTH; + requisition->height = MIN_DISPLAY_HEIGHT; + } + + priv->size_request_once = TRUE; g_debug("Display size request %dx%d (desktop %dx%d)", requisition->width, requisition->height, priv->desktopWidth, priv->desktopHeight); @@ -450,21 +450,6 @@ } } -static void -virt_viewer_display_map(GtkWidget *widget) -{ - VirtViewerDisplay* self = VIRT_VIEWER_DISPLAY(widget); - - GTK_WIDGET_CLASS(virt_viewer_display_parent_class)->map(widget); - - if (!self->priv->mapped_once) - virt_viewer_display_queue_resize(self); - else - virt_viewer_display_make_resizable(self); - - self->priv->mapped_once = TRUE; -} - #else static void virt_viewer_display_get_preferred_width(GtkWidget *widget, @@ -475,10 +460,10 @@ VirtViewerDisplayPrivate *priv = display->priv; int border_width = gtk_container_get_border_width(GTK_CONTAINER(widget)); - *minwidth = 50 + 2 * border_width; + *minwidth = MIN_DISPLAY_WIDTH + 2 * border_width; if (priv->zoom) { - *defwidth = round(priv->desktopWidth * priv->zoom_level / 100.0) + + *defwidth = round(priv->desktopWidth * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL) + 2 * border_width; } else { *defwidth = priv->desktopWidth + 2 * border_width; @@ -494,10 +479,10 @@ VirtViewerDisplayPrivate *priv = display->priv; int border_height = gtk_container_get_border_width(GTK_CONTAINER(widget)); - *minheight = 50 + 2 * border_height; + *minheight = MIN_DISPLAY_HEIGHT + 2 * border_height; if (priv->zoom) { - *defheight = round(priv->desktopHeight * priv->zoom_level / 100.0) + + *defheight = round(priv->desktopHeight * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL) + 2 * border_height; } else { *defheight = priv->desktopHeight + 2 * border_height; @@ -697,13 +682,47 @@ g_object_notify(G_OBJECT(self), "show-hint"); } +/* This function attempts to enable the display if supported by the backend */ +void virt_viewer_display_enable(VirtViewerDisplay *self) +{ + VirtViewerDisplayClass *klass; + + g_return_if_fail(VIRT_VIEWER_IS_DISPLAY(self)); + + klass = VIRT_VIEWER_DISPLAY_GET_CLASS(self); + if (!klass->enable) + return; + + klass->enable(self); +} + +/* This function attempts to disable the display if supported by the backend */ +void virt_viewer_display_disable(VirtViewerDisplay *self) +{ + VirtViewerDisplayClass *klass; + + g_return_if_fail(VIRT_VIEWER_IS_DISPLAY(self)); + + klass = VIRT_VIEWER_DISPLAY_GET_CLASS(self); + if (!klass->disable) + return; + + klass->disable(self); +} + +/* this function simply informs the display that it is enabled. see + * virt_viewer_display_enable()/disable() if you want to attempt to change the + * state of the display */ void virt_viewer_display_set_enabled(VirtViewerDisplay *self, gboolean enabled) { g_return_if_fail(VIRT_VIEWER_IS_DISPLAY(self)); + g_object_freeze_notify(G_OBJECT(self)); + virt_viewer_display_set_show_hint(self, VIRT_VIEWER_DISPLAY_SHOW_HINT_SET, TRUE); - virt_viewer_display_set_show_hint(self, VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED, !enabled); + + g_object_thaw_notify(G_OBJECT(self)); } gboolean virt_viewer_display_get_enabled(VirtViewerDisplay *self) @@ -810,32 +829,36 @@ topx = MAX(topx, 0); topy = MAX(topy, 0); - { - if (virt_viewer_display_get_fullscreen(VIRT_VIEWER_DISPLAY(self))) { - GdkRectangle physical_monitor; - GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(self)); - int n = virt_viewer_display_get_monitor(VIRT_VIEWER_DISPLAY(self)); - if (n == -1) - n = gdk_screen_get_monitor_at_window(screen, - gtk_widget_get_window(GTK_WIDGET(self))); - gdk_screen_get_monitor_geometry(screen, n, &physical_monitor); - preferred->x = physical_monitor.x; - preferred->y = physical_monitor.y; - preferred->width = physical_monitor.width; - preferred->height = physical_monitor.height; - } else { - gtk_widget_get_allocation(GTK_WIDGET(self), preferred); - preferred->x = topx; - preferred->y = topy; - } - - if (virt_viewer_display_get_zoom(VIRT_VIEWER_DISPLAY(self))) { - guint zoom = virt_viewer_display_get_zoom_level(VIRT_VIEWER_DISPLAY(self)); - - preferred->width = round(preferred->width * 100 / zoom); - preferred->height = round(preferred->height * 100 / zoom); - } - } + if (virt_viewer_display_get_fullscreen(VIRT_VIEWER_DISPLAY(self))) { + GdkRectangle physical_monitor; + GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(self)); + int n = virt_viewer_display_get_monitor(VIRT_VIEWER_DISPLAY(self)); + if (n == -1) + n = gdk_screen_get_monitor_at_window(screen, + gtk_widget_get_window(GTK_WIDGET(self))); + gdk_screen_get_monitor_geometry(screen, n, &physical_monitor); + preferred->x = physical_monitor.x; + preferred->y = physical_monitor.y; + preferred->width = physical_monitor.width; + preferred->height = physical_monitor.height; + } else { + gtk_widget_get_allocation(GTK_WIDGET(self), preferred); + preferred->x = topx; + preferred->y = topy; + } + + if (virt_viewer_display_get_zoom(VIRT_VIEWER_DISPLAY(self))) { + guint zoom = virt_viewer_display_get_zoom_level(VIRT_VIEWER_DISPLAY(self)); + + preferred->width = round(preferred->width * NORMAL_ZOOM_LEVEL / (double) zoom); + preferred->height = round(preferred->height * NORMAL_ZOOM_LEVEL / (double) zoom); + } +} + +gint +virt_viewer_display_get_nth(VirtViewerDisplay *self) +{ + return self->priv->nth_display; } /* diff --git a/src/virt-viewer-display.h b/src/virt-viewer-display.h index 70ce772..a899bb4 100644 --- a/src/virt-viewer-display.h +++ b/src/virt-viewer-display.h @@ -28,6 +28,9 @@ #include "virt-viewer-enums.h" G_BEGIN_DECLS + +#define MIN_DISPLAY_WIDTH 50 +#define MIN_DISPLAY_HEIGHT 50 #define VIRT_VIEWER_TYPE_DISPLAY virt_viewer_display_get_type() @@ -87,6 +90,8 @@ void (*display_keyboard_ungrab)(VirtViewerDisplay *display); void (*display_desktop_resize)(VirtViewerDisplay *display); + void (*enable)(VirtViewerDisplay *display); + void (*disable)(VirtViewerDisplay *display); }; GType virt_viewer_display_get_type(void); @@ -122,11 +127,14 @@ void virt_viewer_display_close(VirtViewerDisplay *display); void virt_viewer_display_set_enabled(VirtViewerDisplay *display, gboolean enabled); +void virt_viewer_display_enable(VirtViewerDisplay *display); +void virt_viewer_display_disable(VirtViewerDisplay *display); gboolean virt_viewer_display_get_enabled(VirtViewerDisplay *display); gboolean virt_viewer_display_get_selectable(VirtViewerDisplay *display); void virt_viewer_display_queue_resize(VirtViewerDisplay *display); void virt_viewer_display_get_preferred_monitor_geometry(VirtViewerDisplay *self, GdkRectangle* preferred); void virt_viewer_display_get_preferred_size(VirtViewerDisplay *self, GtkRequisition* requisistion); +gint virt_viewer_display_get_nth(VirtViewerDisplay *self); G_END_DECLS diff --git a/src/virt-viewer-events.c b/src/virt-viewer-events.c index f7ad3a7..9636e3e 100644 --- a/src/virt-viewer-events.c +++ b/src/virt-viewer-events.c @@ -22,6 +22,7 @@ #include +#include #include #include #include @@ -32,13 +33,16 @@ #include #include "virt-viewer-events.h" +#include "virt-glib-compat.h" + +static GMutex *eventlock = NULL; struct virt_viewer_events_handle { int watch; int fd; int events; - int enabled; + int removed; GIOChannel *channel; guint source; virEventHandleCallback cb; @@ -47,8 +51,7 @@ }; static int nextwatch = 1; -static unsigned int nhandles = 0; -static struct virt_viewer_events_handle **handles = NULL; +static GPtrArray *handles; static gboolean virt_viewer_events_dispatch_handle(GIOChannel *source G_GNUC_UNUSED, @@ -84,10 +87,11 @@ { struct virt_viewer_events_handle *data; GIOCondition cond = 0; - - handles = g_realloc(handles, sizeof(*handles)*(nhandles+1)); - data = g_malloc(sizeof(*data)); - memset(data, 0, sizeof(*data)); + int ret; + + g_mutex_lock(eventlock); + + data = g_new0(struct virt_viewer_events_handle, 1); if (events & VIR_EVENT_HANDLE_READABLE) cond |= G_IO_IN; @@ -100,7 +104,7 @@ data->cb = cb; data->opaque = opaque; #ifdef G_OS_WIN32 - g_debug("Converted fd %d to handle %d", fd, _get_osfhandle(fd)); + g_debug("Converted fd %d to handle %"PRIiPTR, fd, _get_osfhandle(fd)); data->channel = g_io_channel_win32_new_socket(_get_osfhandle(fd)); #else data->channel = g_io_channel_unix_new(fd); @@ -109,23 +113,39 @@ g_debug("Add handle %d %d %p", data->fd, events, data->opaque); - data->source = g_io_add_watch(data->channel, - cond, - virt_viewer_events_dispatch_handle, - data); - - handles[nhandles++] = data; - - return data->watch; + if (events != 0) { + data->source = g_io_add_watch(data->channel, + cond, + virt_viewer_events_dispatch_handle, + data); + } + + g_ptr_array_add(handles, data); + + ret = data->watch; + + g_mutex_unlock(eventlock); + + return ret; } static struct virt_viewer_events_handle * virt_viewer_events_find_handle(int watch) { - unsigned int i; - for (i = 0 ; i < nhandles ; i++) - if (handles[i]->watch == watch) - return handles[i]; + guint i; + + for (i = 0 ; i < handles->len ; i++) { + struct virt_viewer_events_handle *h = g_ptr_array_index(handles, i); + + if (h == NULL) { + g_warn_if_reached (); + continue; + } + + if ((h->watch == watch) && !h->removed) { + return h; + } + } return NULL; } @@ -134,17 +154,21 @@ virt_viewer_events_update_handle(int watch, int events) { - struct virt_viewer_events_handle *data = virt_viewer_events_find_handle(watch); + struct virt_viewer_events_handle *data; + + g_mutex_lock(eventlock); + + data = virt_viewer_events_find_handle(watch); if (!data) { g_debug("Update for missing handle watch %d", watch); - return; + goto cleanup; } if (events) { GIOCondition cond = 0; if (events == data->events) - return; + goto cleanup; if (data->source) g_source_remove(data->source); @@ -161,12 +185,15 @@ data->events = events; } else { if (!data->source) - return; + goto cleanup; g_source_remove(data->source); data->source = 0; data->events = 0; } + +cleanup: + g_mutex_unlock(eventlock); } @@ -181,7 +208,10 @@ if (data->ff) (data->ff)(data->opaque); - free(data); + g_mutex_lock(eventlock); + g_ptr_array_remove_fast(handles, data); + g_mutex_unlock(eventlock); + return FALSE; } @@ -189,30 +219,48 @@ static int virt_viewer_events_remove_handle(int watch) { - struct virt_viewer_events_handle *data = virt_viewer_events_find_handle(watch); + struct virt_viewer_events_handle *data; + int ret = -1; + + g_mutex_lock(eventlock); + + data = virt_viewer_events_find_handle(watch); if (!data) { g_debug("Remove of missing watch %d", watch); - return -1; + goto cleanup; } g_debug("Remove handle %d %d", watch, data->fd); - if (!data->source) - return -1; - - g_source_remove(data->source); - data->source = 0; - data->events = 0; - + if (data->source != 0) { + g_source_remove(data->source); + data->source = 0; + data->events = 0; + } + + g_warn_if_fail(data->channel != NULL); + g_io_channel_unref(data->channel); + data->channel = NULL; + + /* since the actual watch deletion is done asynchronously, a update_handle call may + * reschedule the watch before it's fully deleted, that's why we need to mark it as + * 'removed' to prevent reuse + */ + data->removed = TRUE; g_idle_add(virt_viewer_events_cleanup_handle, data); - return 0; + ret = 0; + +cleanup: + g_mutex_unlock(eventlock); + return ret; } struct virt_viewer_events_timeout { int timer; int interval; + int removed; guint source; virEventTimeoutCallback cb; void *opaque; @@ -221,8 +269,7 @@ static int nexttimer = 1; -static unsigned int ntimeouts = 0; -static struct virt_viewer_events_timeout **timeouts = NULL; +static GPtrArray *timeouts; static gboolean virt_viewer_events_dispatch_timeout(void *opaque) @@ -241,10 +288,11 @@ virFreeCallback ff) { struct virt_viewer_events_timeout *data; - - timeouts = g_realloc(timeouts, sizeof(*timeouts)*(ntimeouts+1)); - data = g_malloc(sizeof(*data)); - memset(data, 0, sizeof(*data)); + int ret; + + g_mutex_lock(eventlock); + + data = g_new0(struct virt_viewer_events_timeout, 1); data->timer = nexttimer++; data->interval = interval; @@ -256,21 +304,37 @@ virt_viewer_events_dispatch_timeout, data); - timeouts[ntimeouts++] = data; + g_ptr_array_add(timeouts, data); g_debug("Add timeout %p %d %p %p %d", data, interval, cb, opaque, data->timer); - return data->timer; + ret = data->timer; + + g_mutex_unlock(eventlock); + + return ret; } static struct virt_viewer_events_timeout * virt_viewer_events_find_timeout(int timer) { - unsigned int i; - for (i = 0 ; i < ntimeouts ; i++) - if (timeouts[i]->timer == timer) - return timeouts[i]; + guint i; + + g_return_val_if_fail(timeouts != NULL, NULL); + + for (i = 0 ; i < timeouts->len ; i++) { + struct virt_viewer_events_timeout *t = g_ptr_array_index(timeouts, i); + + if (t == NULL) { + g_warn_if_reached (); + continue; + } + + if ((t->timer == timer) && !t->removed) { + return t; + } + } return NULL; } @@ -280,18 +344,21 @@ virt_viewer_events_update_timeout(int timer, int interval) { - struct virt_viewer_events_timeout *data = virt_viewer_events_find_timeout(timer); - + struct virt_viewer_events_timeout *data; + + g_mutex_lock(eventlock); + + data = virt_viewer_events_find_timeout(timer); if (!data) { g_debug("Update of missing timer %d", timer); - return; + goto cleanup; } g_debug("Update timeout %p %d %d", data, timer, interval); if (interval >= 0) { if (data->source) - return; + g_source_remove(data->source); data->interval = interval; data->source = g_timeout_add(data->interval, @@ -299,11 +366,14 @@ data); } else { if (!data->source) - return; + goto cleanup; g_source_remove(data->source); data->source = 0; } + +cleanup: + g_mutex_unlock(eventlock); } @@ -318,7 +388,10 @@ if (data->ff) (data->ff)(data->opaque); - free(data); + g_mutex_lock(eventlock); + g_ptr_array_remove_fast(timeouts, data); + g_mutex_unlock(eventlock); + return FALSE; } @@ -326,33 +399,56 @@ static int virt_viewer_events_remove_timeout(int timer) { - struct virt_viewer_events_timeout *data = virt_viewer_events_find_timeout(timer); - + struct virt_viewer_events_timeout *data; + int ret = -1; + + g_mutex_lock(eventlock); + + data = virt_viewer_events_find_timeout(timer); if (!data) { g_debug("Remove of missing timer %d", timer); - return -1; + goto cleanup; } g_debug("Remove timeout %p %d", data, timer); - if (!data->source) - return -1; - - g_source_remove(data->source); - data->source = 0; - + if (data->source != 0) { + g_source_remove(data->source); + data->source = 0; + } + + /* since the actual timeout deletion is done asynchronously, a update_timeout call may + * reschedule the timeout before it's fully deleted, that's why we need to mark it as + * 'removed' to prevent reuse + */ + data->removed = TRUE; g_idle_add(virt_viewer_events_cleanup_timeout, data); - return 0; -} - - -void virt_viewer_events_register(void) { + ret = 0; + +cleanup: + g_mutex_unlock(eventlock); + return ret; +} + +static gpointer event_register_once(gpointer data G_GNUC_UNUSED) +{ + eventlock = g_mutex_new(); + timeouts = g_ptr_array_new_with_free_func(g_free); + handles = g_ptr_array_new_with_free_func(g_free); virEventRegisterImpl(virt_viewer_events_add_handle, virt_viewer_events_update_handle, virt_viewer_events_remove_handle, virt_viewer_events_add_timeout, virt_viewer_events_update_timeout, virt_viewer_events_remove_timeout); + + return NULL; +} + +void virt_viewer_events_register(void) { + static GOnce once = G_ONCE_INIT; + + g_once(&once, event_register_once, NULL); } /* diff --git a/src/virt-viewer-file.c b/src/virt-viewer-file.c index ae067f5..2f1eb2b 100644 --- a/src/virt-viewer-file.c +++ b/src/virt-viewer-file.c @@ -2,7 +2,7 @@ /* * Virt Viewer: A virtual machine console viewer * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2015 Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,6 +39,9 @@ * * The current list of [virt-viewer] keys is: * - version: string + * - versions: list of id:versions strings + * - newer-version-url: string specifying an URL to display when the minimum + * version check fails * - type: string, mandatory, values: "spice" (later "vnc" etc..) * - host: string * - port: int @@ -47,7 +50,7 @@ * - password: string * - disable-channels: string list * - tls-ciphers: string - * - ca: string PEM data (use \n to seperate the lines) + * - ca: string PEM data (use \n to separate the lines) * - host-subject: string * - fullscreen: int (0 or 1 atm) * - title: string @@ -66,6 +69,19 @@ * - delete-this-file: int (0 or 1 atm) * - proxy: proxy URL, like http://user:pass@foobar:8080 * + * There is an optional [ovirt] section which can be used to specify + * the connection parameters to interact with the remote oVirt REST API. + * This is currently used to present a list of CDRom images which can be + * inserted in the VM. + * + * - host: string containing the URL of the oVirt engine + * - vm-guid: string containing the guid of the oVirt VM we are connecting to + * - jsessionid: string containing an authentication cookie to be used to + * connect to the oVirt engine without being asked for credentials + * - ca: string PEM data (use \n to separate the lines) + * - admin: boolean (0 or 1) indicating whether the VM is visible in the user or + * admin portal + * * (the file can be extended with extra groups or keys, which should * be prefixed with x- to avoid later conflicts) */ @@ -78,7 +94,8 @@ #define VIRT_VIEWER_FILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), VIRT_VIEWER_TYPE_FILE, VirtViewerFilePrivate)) -#define GROUP "virt-viewer" +#define MAIN_GROUP "virt-viewer" +#define OVIRT_GROUP "ovirt" enum { PROP_DUMMY_PROPERTY, @@ -104,9 +121,16 @@ PROP_USB_FILTER, PROP_PROXY, PROP_VERSION, + PROP_VERSIONS, + PROP_VERSION_URL, PROP_SECURE_CHANNELS, PROP_DELETE_THIS_FILE, PROP_SECURE_ATTENTION, + PROP_OVIRT_ADMIN, + PROP_OVIRT_HOST, + PROP_OVIRT_VM_GUID, + PROP_OVIRT_JSESSIONID, + PROP_OVIRT_CA, }; VirtViewerFile* @@ -128,7 +152,7 @@ return NULL; } - if (!g_key_file_has_group (keyfile, GROUP) || + if (!g_key_file_has_group (keyfile, MAIN_GROUP) || !virt_viewer_file_is_set(self, "type")) { inner_error = g_error_new_literal(G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND, "Invalid file"); @@ -155,7 +179,7 @@ g_return_val_if_fail(VIRT_VIEWER_IS_FILE(self), FALSE); g_return_val_if_fail(key != NULL, FALSE); - set = g_key_file_has_key(self->priv->keyfile, GROUP, key, &inner_error); + set = g_key_file_has_key(self->priv->keyfile, MAIN_GROUP, key, &inner_error); if (inner_error == NULL) return set; else { @@ -165,17 +189,20 @@ } static void -virt_viewer_file_set_string(VirtViewerFile* self, const gchar* key, const gchar* value) +virt_viewer_file_set_string(VirtViewerFile* self, const char *group, + const gchar* key, const gchar* value) { g_return_if_fail(VIRT_VIEWER_IS_FILE(self)); g_return_if_fail(key != NULL); g_return_if_fail(value != NULL); - g_key_file_set_string(self->priv->keyfile, GROUP, key, value); + g_key_file_set_string(self->priv->keyfile, group, key, value); } static gchar* -virt_viewer_file_get_string(VirtViewerFile* self, const gchar* key) +virt_viewer_file_get_string(VirtViewerFile* self, + const char *group, + const gchar* key) { GError* inner_error = NULL; gchar* result = NULL; @@ -183,7 +210,7 @@ g_return_val_if_fail(VIRT_VIEWER_IS_FILE(self), NULL); g_return_val_if_fail(key != NULL, NULL); - result = g_key_file_get_string(self->priv->keyfile, GROUP, key, &inner_error); + result = g_key_file_get_string(self->priv->keyfile, group, key, &inner_error); if (inner_error && inner_error->domain != G_KEY_FILE_ERROR) g_critical("%s", inner_error->message); g_clear_error(&inner_error); @@ -192,16 +219,19 @@ } static void -virt_viewer_file_set_string_list(VirtViewerFile* self, const gchar* key, const gchar* const* value, gsize length) +virt_viewer_file_set_string_list(VirtViewerFile* self, const char *group, + const gchar* key, const gchar* const* value, + gsize length) { g_return_if_fail(VIRT_VIEWER_IS_FILE(self)); g_return_if_fail(key != NULL); - g_key_file_set_string_list(self->priv->keyfile, GROUP, key, value, length); + g_key_file_set_string_list(self->priv->keyfile, group, key, value, length); } static gchar** -virt_viewer_file_get_string_list(VirtViewerFile* self, const gchar* key, gsize* length) +virt_viewer_file_get_string_list(VirtViewerFile* self, const char *group, + const gchar* key, gsize* length) { GError* inner_error = NULL; gchar** result = NULL; @@ -209,7 +239,7 @@ g_return_val_if_fail(VIRT_VIEWER_IS_FILE(self), NULL); g_return_val_if_fail(key != NULL, NULL); - result = g_key_file_get_string_list(self->priv->keyfile, GROUP, key, length, &inner_error); + result = g_key_file_get_string_list(self->priv->keyfile, group, key, length, &inner_error); if (inner_error && inner_error->domain != G_KEY_FILE_ERROR) g_critical("%s", inner_error->message); g_clear_error(&inner_error); @@ -218,16 +248,19 @@ } static void -virt_viewer_file_set_int(VirtViewerFile* self, const gchar* key, gint value) +virt_viewer_file_set_int(VirtViewerFile* self, const char *group, + const gchar* key, gint value) { g_return_if_fail(VIRT_VIEWER_IS_FILE(self)); g_return_if_fail(key != NULL); - g_key_file_set_integer(self->priv->keyfile, GROUP, key, value); + g_key_file_set_integer(self->priv->keyfile, group, key, value); } static gint -virt_viewer_file_get_int(VirtViewerFile* self, const gchar* key) +virt_viewer_file_get_int(VirtViewerFile* self, + const char *group, + const gchar* key) { GError* inner_error = NULL; gint result; @@ -235,7 +268,7 @@ g_return_val_if_fail(VIRT_VIEWER_IS_FILE(self), -1); g_return_val_if_fail(key != NULL, -1); - result = g_key_file_get_integer(self->priv->keyfile, GROUP, key, &inner_error); + result = g_key_file_get_integer(self->priv->keyfile, group, key, &inner_error); if (inner_error && inner_error->domain != G_KEY_FILE_ERROR) g_critical("%s", inner_error->message); g_clear_error(&inner_error); @@ -246,352 +279,496 @@ gchar* virt_viewer_file_get_ca(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "ca"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "ca"); } void virt_viewer_file_set_ca(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "ca", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "ca", value); g_object_notify(G_OBJECT(self), "ca"); } gchar* virt_viewer_file_get_host(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "host"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "host"); } void virt_viewer_file_set_host(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "host", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "host", value); g_object_notify(G_OBJECT(self), "host"); } gchar* virt_viewer_file_get_file_type(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "type"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "type"); } void virt_viewer_file_set_type(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "type", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "type", value); g_object_notify(G_OBJECT(self), "type"); } gint virt_viewer_file_get_port(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "port"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "port"); } void virt_viewer_file_set_port(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "port", value); + virt_viewer_file_set_int(self, MAIN_GROUP, "port", value); g_object_notify(G_OBJECT(self), "port"); } gint virt_viewer_file_get_tls_port(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "tls-port"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "tls-port"); } void virt_viewer_file_set_tls_port(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "tls-port", value); + virt_viewer_file_set_int(self, MAIN_GROUP, "tls-port", value); g_object_notify(G_OBJECT(self), "tls-port"); } gchar* virt_viewer_file_get_username(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "username"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "username"); } gchar* virt_viewer_file_get_password(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "password"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "password"); } void virt_viewer_file_set_username(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "username", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "username", value); g_object_notify(G_OBJECT(self), "username"); } void virt_viewer_file_set_password(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "password", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "password", value); g_object_notify(G_OBJECT(self), "password"); } gchar** virt_viewer_file_get_disable_channels(VirtViewerFile* self, gsize* length) { - return virt_viewer_file_get_string_list(self, "disable-channels", length); + return virt_viewer_file_get_string_list(self, MAIN_GROUP, + "disable-channels", length); } void virt_viewer_file_set_disable_channels(VirtViewerFile* self, const gchar* const* value, gsize length) { - virt_viewer_file_set_string_list(self, "disable-channels", value, length); + virt_viewer_file_set_string_list(self, MAIN_GROUP, + "disable-channels", value, length); g_object_notify(G_OBJECT(self), "disable-channels"); } gchar** virt_viewer_file_get_disable_effects(VirtViewerFile* self, gsize* length) { - return virt_viewer_file_get_string_list(self, "disable-effects", length); + return virt_viewer_file_get_string_list(self, MAIN_GROUP, + "disable-effects", length); } void virt_viewer_file_set_disable_effects(VirtViewerFile* self, const gchar* const* value, gsize length) { - virt_viewer_file_set_string_list(self, "disable-effects", value, length); + virt_viewer_file_set_string_list(self, MAIN_GROUP, + "disable-effects", value, length); g_object_notify(G_OBJECT(self), "disable-effects"); } gchar* virt_viewer_file_get_tls_ciphers(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "tls-ciphers"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "tls-ciphers"); } void virt_viewer_file_set_tls_ciphers(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "tls-ciphers", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "tls-ciphers", value); g_object_notify(G_OBJECT(self), "tls-ciphers"); } gchar* virt_viewer_file_get_host_subject(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "host-subject"); + return virt_viewer_file_get_string(self, MAIN_GROUP, + "host-subject"); } void virt_viewer_file_set_host_subject(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "host-subject", value); + virt_viewer_file_set_string(self, MAIN_GROUP, + "host-subject", value); g_object_notify(G_OBJECT(self), "host-subject"); } gint virt_viewer_file_get_fullscreen(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "fullscreen"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "fullscreen"); } void virt_viewer_file_set_fullscreen(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "fullscreen", !!value); + virt_viewer_file_set_int(self, MAIN_GROUP, "fullscreen", !!value); g_object_notify(G_OBJECT(self), "fullscreen"); } gchar* virt_viewer_file_get_title(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "title"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "title"); } void virt_viewer_file_set_title(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "title", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "title", value); g_object_notify(G_OBJECT(self), "title"); } gchar* virt_viewer_file_get_toggle_fullscreen(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "toggle-fullscreen"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "toggle-fullscreen"); } void virt_viewer_file_set_toggle_fullscreen(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "toggle-fullscreen", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "toggle-fullscreen", value); g_object_notify(G_OBJECT(self), "toggle-fullscreen"); } gchar* virt_viewer_file_get_release_cursor(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "release-cursor"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "release-cursor"); } void virt_viewer_file_set_release_cursor(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "release-cursor", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "release-cursor", value); g_object_notify(G_OBJECT(self), "release-cursor"); } gchar* virt_viewer_file_get_secure_attention(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "secure-attention"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "secure-attention"); } void virt_viewer_file_set_secure_attention(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "secure-attention", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "secure-attention", value); g_object_notify(G_OBJECT(self), "secure-attention"); } gchar* virt_viewer_file_get_smartcard_remove(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "smartcard-remove"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "smartcard-remove"); } void virt_viewer_file_set_smartcard_remove(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "smartcard-remove", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "smartcard-remove", value); g_object_notify(G_OBJECT(self), "smartcard-remove"); } gchar* virt_viewer_file_get_smartcard_insert(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "smartcard-insert"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "smartcard-insert"); } void virt_viewer_file_set_smartcard_insert(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "smartcard-insert", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "smartcard-insert", value); g_object_notify(G_OBJECT(self), "smartcard-insert"); } gint virt_viewer_file_get_enable_smartcard(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "enable-smartcard"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "enable-smartcard"); } void virt_viewer_file_set_enable_smartcard(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "enable-smartcard", !!value); + virt_viewer_file_set_int(self, MAIN_GROUP, "enable-smartcard", !!value); g_object_notify(G_OBJECT(self), "enable-smartcard"); } gint virt_viewer_file_get_enable_usbredir(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "enable-usbredir"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "enable-usbredir"); } void virt_viewer_file_set_enable_usbredir(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "enable-usbredir", !!value); + virt_viewer_file_set_int(self, MAIN_GROUP, "enable-usbredir", !!value); g_object_notify(G_OBJECT(self), "enable-usbredir"); } gint virt_viewer_file_get_delete_this_file(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "delete-this-file"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "delete-this-file"); } void virt_viewer_file_set_delete_this_file(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "delete-this-file", !!value); + virt_viewer_file_set_int(self, MAIN_GROUP, "delete-this-file", !!value); g_object_notify(G_OBJECT(self), "delete-this-file"); } gint virt_viewer_file_get_color_depth(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "color-depth"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "color-depth"); } void virt_viewer_file_set_color_depth(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "color-depth", value); + virt_viewer_file_set_int(self, MAIN_GROUP, "color-depth", value); g_object_notify(G_OBJECT(self), "color-depth"); } gint virt_viewer_file_get_enable_usb_autoshare(VirtViewerFile* self) { - return virt_viewer_file_get_int(self, "enable-usb-autoshare"); + return virt_viewer_file_get_int(self, MAIN_GROUP, "enable-usb-autoshare"); } void virt_viewer_file_set_enable_usb_autoshare(VirtViewerFile* self, gint value) { - virt_viewer_file_set_int(self, "enable-usb-autoshare", !!value); + virt_viewer_file_set_int(self, MAIN_GROUP, "enable-usb-autoshare", !!value); g_object_notify(G_OBJECT(self), "enable-usb-autoshare"); } gchar* virt_viewer_file_get_usb_filter(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "usb-filter"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "usb-filter"); } void virt_viewer_file_set_usb_filter(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "usb-filter", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "usb-filter", value); g_object_notify(G_OBJECT(self), "usb-filter"); } gchar* virt_viewer_file_get_proxy(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "proxy"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "proxy"); } void virt_viewer_file_set_proxy(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "proxy", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "proxy", value); g_object_notify(G_OBJECT(self), "proxy"); } gchar* virt_viewer_file_get_version(VirtViewerFile* self) { - return virt_viewer_file_get_string(self, "version"); + return virt_viewer_file_get_string(self, MAIN_GROUP, "version"); } void virt_viewer_file_set_version(VirtViewerFile* self, const gchar* value) { - virt_viewer_file_set_string(self, "version", value); + virt_viewer_file_set_string(self, MAIN_GROUP, "version", value); g_object_notify(G_OBJECT(self), "version"); } + +GHashTable* +virt_viewer_file_get_versions(VirtViewerFile* self) +{ + GHashTable *versions; + gchar **versions_str; + gsize length; + unsigned int i; + + versions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + versions_str = virt_viewer_file_get_string_list(self, MAIN_GROUP, + "versions", &length); + for (i = 0; i < length; i++) { + GStrv tokens; + + if (versions_str[i] == NULL) { + g_warn_if_reached(); + break; + } + tokens = g_strsplit(versions_str[i], ":", 2); + if (g_strv_length(tokens) != 2) { + g_warn_if_reached(); + continue; + } + g_debug("Minimum version '%s' for OS id '%s'", tokens[1], tokens[0]); + g_hash_table_insert(versions, tokens[0], tokens[1]); + g_free(tokens); + } + g_strfreev(versions_str); + + return versions; +} + +void +virt_viewer_file_set_versions(VirtViewerFile* self, GHashTable *version_table) +{ + GHashTableIter iter; + gpointer key, value; + GPtrArray *versions; + + versions = g_ptr_array_new_with_free_func(g_free); + + g_hash_table_iter_init(&iter, version_table); + while (g_hash_table_iter_next(&iter, &key, &value)) { + char *str; + + /* Check that id only contains letters/numbers/- */ + /* Check that version only contains numbers, ., :, -, (letters ?) */ + /* FIXME: ':' separator overlaps with ':' epoch indicator */ + + str = g_strdup_printf("%s:%s", (char *)key, (char *)value); + g_ptr_array_add(versions, str); + } + virt_viewer_file_set_string_list(self, MAIN_GROUP, "versions", + (const char * const *)versions->pdata, + versions->len); + g_ptr_array_unref(versions); + g_object_notify(G_OBJECT(self), "versions"); +} + +gchar* +virt_viewer_file_get_version_url(VirtViewerFile* self) +{ + return virt_viewer_file_get_string(self, MAIN_GROUP, "newer-version-url"); +} + +void +virt_viewer_file_set_version_url(VirtViewerFile* self, const gchar* value) +{ + virt_viewer_file_set_string(self, MAIN_GROUP, "newer-version-url", value); + g_object_notify(G_OBJECT(self), "version-url"); +} + gchar** virt_viewer_file_get_secure_channels(VirtViewerFile* self, gsize* length) { - return virt_viewer_file_get_string_list(self, "secure-channels", length); + return virt_viewer_file_get_string_list(self, MAIN_GROUP, "secure-channels", length); } void virt_viewer_file_set_secure_channels(VirtViewerFile* self, const gchar* const* value, gsize length) { - virt_viewer_file_set_string_list(self, "secure-channels", value, length); + virt_viewer_file_set_string_list(self, MAIN_GROUP, "secure-channels", value, length); g_object_notify(G_OBJECT(self), "secure-channels"); +} + +gchar* +virt_viewer_file_get_ovirt_host(VirtViewerFile* self) +{ + return virt_viewer_file_get_string(self, OVIRT_GROUP, "host"); +} + +void +virt_viewer_file_set_ovirt_host(VirtViewerFile* self, const gchar* value) +{ + virt_viewer_file_set_string(self, OVIRT_GROUP, "host", value); + g_object_notify(G_OBJECT(self), "ovirt-host"); +} + +gchar* +virt_viewer_file_get_ovirt_vm_guid(VirtViewerFile* self) +{ + return virt_viewer_file_get_string(self, OVIRT_GROUP, "vm-guid"); +} + +void +virt_viewer_file_set_ovirt_vm_guid(VirtViewerFile* self, const gchar* value) +{ + virt_viewer_file_set_string(self, OVIRT_GROUP, "vm-guid", value); + g_object_notify(G_OBJECT(self), "ovirt-vm-guid"); +} + +gchar* +virt_viewer_file_get_ovirt_jsessionid(VirtViewerFile* self) +{ + return virt_viewer_file_get_string(self, OVIRT_GROUP, "jsessionid"); +} + +void +virt_viewer_file_set_ovirt_jsessionid(VirtViewerFile* self, const gchar* value) +{ + virt_viewer_file_set_string(self, OVIRT_GROUP, "jsessionid", value); + g_object_notify(G_OBJECT(self), "ovirt-jsessionid"); +} + +gchar* +virt_viewer_file_get_ovirt_ca(VirtViewerFile* self) +{ + return virt_viewer_file_get_string(self, OVIRT_GROUP, "ca"); +} + +void +virt_viewer_file_set_ovirt_ca(VirtViewerFile* self, const gchar* value) +{ + virt_viewer_file_set_string(self, OVIRT_GROUP, "ca", value); + g_object_notify(G_OBJECT(self), "ovirt-ca"); +} + +gint +virt_viewer_file_get_ovirt_admin(VirtViewerFile* self) +{ + return virt_viewer_file_get_int(self, OVIRT_GROUP, "admin"); +} + +void +virt_viewer_file_set_ovirt_admin(VirtViewerFile* self, gint value) +{ + virt_viewer_file_set_int(self, OVIRT_GROUP, "admin", value); + g_object_notify(G_OBJECT(self), "ovirt-admin"); } static void @@ -608,27 +785,70 @@ gtk_accel_map_change_entry(accel_path, accel_key, accel_mods, TRUE); } +static gboolean +virt_viewer_file_check_min_version(VirtViewerFile *self, GError **error) +{ + gchar *min_version = NULL; + gint version_cmp; + +#ifdef REMOTE_VIEWER_OS_ID + if (virt_viewer_file_is_set(self, "versions")) { + GHashTable *versions; + + versions = virt_viewer_file_get_versions(self); + + min_version = g_strdup(g_hash_table_lookup(versions, REMOTE_VIEWER_OS_ID)); + + g_hash_table_unref(versions); + } +#endif + + + if (min_version == NULL) { + if (virt_viewer_file_is_set(self, "version")) { + min_version = virt_viewer_file_get_version(self); + } + } + + if (min_version == NULL) { + return TRUE; + } + version_cmp = virt_viewer_compare_buildid(min_version, PACKAGE_VERSION BUILDID); + + if (version_cmp > 0) { + gchar *url; + url = virt_viewer_file_get_version_url(self); + if (url != NULL) { + g_set_error(error, + VIRT_VIEWER_ERROR, + VIRT_VIEWER_ERROR_FAILED, + _("At least %s version %s is required to setup this" + " connection, see %s for details"), + g_get_application_name(), min_version, url); + g_free(url); + } else { + g_set_error(error, + VIRT_VIEWER_ERROR, + VIRT_VIEWER_ERROR_FAILED, + _("At least %s version %s is required to setup this connection"), + g_get_application_name(), min_version); + } + g_free(min_version); + return FALSE; + } + g_free(min_version); + + return TRUE; +} + gboolean virt_viewer_file_fill_app(VirtViewerFile* self, VirtViewerApp *app, GError **error) { g_return_val_if_fail(VIRT_VIEWER_IS_FILE(self), FALSE); g_return_val_if_fail(VIRT_VIEWER_IS_APP(app), FALSE); - if (virt_viewer_file_is_set(self, "version")) { - gchar *val = virt_viewer_file_get_version(self); - - if (virt_viewer_compare_version(val, PACKAGE_VERSION) > 0) { - g_set_error(error, - VIRT_VIEWER_ERROR, - VIRT_VIEWER_ERROR_FAILED, - _("At least %s version %s is required to setup this connection"), - g_get_application_name(), val); - - g_free(val); - return FALSE; - } - - g_free(val); + if (!virt_viewer_file_check_min_version(self, error)) { + return FALSE; } if (virt_viewer_file_is_set(self, "title")) { @@ -750,6 +970,12 @@ case PROP_VERSION: virt_viewer_file_set_version(self, g_value_get_string(value)); break; + case PROP_VERSIONS: + virt_viewer_file_set_versions(self, g_value_get_boxed(value)); + break; + case PROP_VERSION_URL: + virt_viewer_file_set_version_url(self, g_value_get_string(value)); + break; case PROP_SECURE_CHANNELS: strv = g_value_get_boxed(value); virt_viewer_file_set_secure_channels(self, (const gchar* const*)strv, g_strv_length(strv)); @@ -757,6 +983,21 @@ case PROP_DELETE_THIS_FILE: virt_viewer_file_set_delete_this_file(self, g_value_get_int(value)); break; + case PROP_OVIRT_ADMIN: + virt_viewer_file_set_ovirt_admin(self, g_value_get_int(value)); + break; + case PROP_OVIRT_HOST: + virt_viewer_file_set_ovirt_host(self, g_value_get_string(value)); + break; + case PROP_OVIRT_VM_GUID: + virt_viewer_file_set_ovirt_vm_guid(self, g_value_get_string(value)); + break; + case PROP_OVIRT_JSESSIONID: + virt_viewer_file_set_ovirt_jsessionid(self, g_value_get_string(value)); + break; + case PROP_OVIRT_CA: + virt_viewer_file_set_ovirt_ca(self, g_value_get_string(value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); break; @@ -839,11 +1080,32 @@ case PROP_VERSION: g_value_take_string(value, virt_viewer_file_get_version(self)); break; + case PROP_VERSIONS: + g_value_take_boxed(value, virt_viewer_file_get_versions(self)); + break; + case PROP_VERSION_URL: + g_value_take_string(value, virt_viewer_file_get_version_url(self)); + break; case PROP_SECURE_CHANNELS: g_value_take_boxed(value, virt_viewer_file_get_secure_channels(self, NULL)); break; case PROP_DELETE_THIS_FILE: g_value_set_int(value, virt_viewer_file_get_delete_this_file(self)); + break; + case PROP_OVIRT_ADMIN: + g_value_set_int(value, virt_viewer_file_get_ovirt_admin(self)); + break; + case PROP_OVIRT_HOST: + g_value_take_string(value, virt_viewer_file_get_ovirt_host(self)); + break; + case PROP_OVIRT_VM_GUID: + g_value_take_string(value, virt_viewer_file_get_ovirt_vm_guid(self)); + break; + case PROP_OVIRT_JSESSIONID: + g_value_take_string(value, virt_viewer_file_get_ovirt_jsessionid(self)); + break; + case PROP_OVIRT_CA: + g_value_take_string(value, virt_viewer_file_get_ovirt_ca(self)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); @@ -972,6 +1234,14 @@ g_param_spec_string("version", "version", "version", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_VERSIONS, + g_param_spec_boxed("versions", "versions", "versions", G_TYPE_HASH_TABLE, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_VERSION_URL, + g_param_spec_string("version-url", "version-url", "version-url", NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_SECURE_CHANNELS, g_param_spec_boxed("secure-channels", "secure-channels", "secure-channels", G_TYPE_STRV, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); @@ -979,4 +1249,24 @@ g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_DELETE_THIS_FILE, g_param_spec_int("delete-this-file", "delete-this-file", "delete-this-file", 0, 1, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); -} + + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_OVIRT_ADMIN, + g_param_spec_int("ovirt-admin", "ovirt-admin", "ovirt-admin", 0, 1, 0, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_OVIRT_HOST, + g_param_spec_string("ovirt-host", "ovirt-host", "ovirt-host", NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_OVIRT_VM_GUID, + g_param_spec_string("ovirt-vm-guid", "ovirt-vm-guid", "ovirt-vm-guid", NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_OVIRT_JSESSIONID, + g_param_spec_string("ovirt-jsessionid", "ovirt-jsessionid", "ovirt-jsessionid", NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_OVIRT_CA, + g_param_spec_string("ovirt-ca", "ovirt-ca", "ovirt-ca", NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); +} diff --git a/src/virt-viewer-file.h b/src/virt-viewer-file.h index 9507bf9..0eb7966 100644 --- a/src/virt-viewer-file.h +++ b/src/virt-viewer-file.h @@ -102,12 +102,26 @@ void virt_viewer_file_set_proxy(VirtViewerFile* self, const gchar* value); gchar* virt_viewer_file_get_version(VirtViewerFile* self); void virt_viewer_file_set_version(VirtViewerFile* self, const gchar* value); +GHashTable* virt_viewer_file_get_versions(VirtViewerFile* self); +void virt_viewer_file_set_versions(VirtViewerFile* self, GHashTable *version_table); +gchar* virt_viewer_file_get_version_url(VirtViewerFile* self); +void virt_viewer_file_set_version_url(VirtViewerFile* self, const gchar* value); gchar** virt_viewer_file_get_secure_channels(VirtViewerFile* self, gsize* length); void virt_viewer_file_set_secure_channels(VirtViewerFile* self, const gchar* const* value, gsize length); gint virt_viewer_file_get_delete_this_file(VirtViewerFile* self); void virt_viewer_file_set_delete_this_file(VirtViewerFile* self, gint value); gchar* virt_viewer_file_get_secure_attention(VirtViewerFile* self); void virt_viewer_file_set_secure_attention(VirtViewerFile* self, const gchar* value); +gint virt_viewer_file_get_ovirt_admin(VirtViewerFile* self); +void virt_viewer_file_set_ovirt_admin(VirtViewerFile* self, gint value); +gchar* virt_viewer_file_get_ovirt_host(VirtViewerFile* self); +void virt_viewer_file_set_ovirt_host(VirtViewerFile* self, const gchar* value); +gchar* virt_viewer_file_get_ovirt_vm_guid(VirtViewerFile* self); +void virt_viewer_file_set_ovirt_vm_guid(VirtViewerFile* self, const gchar* value); +gchar* virt_viewer_file_get_ovirt_jsessionid(VirtViewerFile* self); +void virt_viewer_file_set_ovirt_jsessionid(VirtViewerFile* self, const gchar* value); +gchar* virt_viewer_file_get_ovirt_ca(VirtViewerFile* self); +void virt_viewer_file_set_ovirt_ca(VirtViewerFile* self, const gchar* value); G_END_DECLS diff --git a/src/virt-viewer-guest-details.xml b/src/virt-viewer-guest-details.xml new file mode 100644 index 0000000..7f00567 --- /dev/null +++ b/src/virt-viewer-guest-details.xml @@ -0,0 +1,120 @@ + + + + + + False + Guest Details + True + 400 + dialog + + + + False + vertical + 2 + + + False + end + + + gtk-close + True + True + True + True + + + False + True + 0 + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + 6 + 2 + + + True + False + 1 + Name: + + + GTK_SHRINK | GTK_FILL + GTK_FILL + + + + + True + False + 1 + GUID: + + + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_FILL + + + + + True + False + 0 + label + True + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + label + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + False + True + 1 + + + + + + button1 + + + diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c index 44d1182..505b472 100644 --- a/src/virt-viewer-main.c +++ b/src/virt-viewer-main.c @@ -98,23 +98,33 @@ if (error) { g_printerr("%s\n%s\n", error->message, help_msg); - g_error_free(error); goto cleanup; } g_option_context_free(context); - if (!args || (g_strv_length(args) != 1)) { - g_printerr(_("\nUsage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n\n%s\n\n"), argv[0], help_msg); + if (args && (g_strv_length(args) != 1)) { + g_printerr(_("\nUsage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n\n%s\n\n"), argv[0], help_msg); goto cleanup; } - viewer = virt_viewer_new(uri, args[0], direct, attach, waitvm, reconnect); + if (args == NULL && waitvm) { + g_printerr(_("\nNo DOMAIN-NAME|ID|UUID was specified for '--wait'\n\n")); + goto cleanup; + } + + viewer = virt_viewer_new(uri, (args) ? args[0] : NULL, direct, attach, waitvm, reconnect); if (viewer == NULL) goto cleanup; - if (!virt_viewer_app_start(VIRT_VIEWER_APP(viewer))) + if (!virt_viewer_app_start(VIRT_VIEWER_APP(viewer), &error)) { + if (g_error_matches(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED)) + ret = 0; + else if (error) { + virt_viewer_app_simple_message_dialog(VIRT_VIEWER_APP(viewer), error->message); + } goto cleanup; + } gtk_main(); @@ -126,6 +136,7 @@ g_free(uri); g_strfreev(args); g_free(help_msg); + g_clear_error(&error); return ret; } diff --git a/src/virt-viewer-notebook.c b/src/virt-viewer-notebook.c index 07497e3..98b663f 100644 --- a/src/virt-viewer-notebook.c +++ b/src/virt-viewer-notebook.c @@ -57,12 +57,6 @@ } static void -virt_viewer_notebook_dispose (GObject *object) -{ - G_OBJECT_CLASS (virt_viewer_notebook_parent_class)->dispose (object); -} - -static void virt_viewer_notebook_class_init (VirtViewerNotebookClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -71,7 +65,6 @@ object_class->get_property = virt_viewer_notebook_get_property; object_class->set_property = virt_viewer_notebook_set_property; - object_class->dispose = virt_viewer_notebook_dispose; } static void diff --git a/src/virt-viewer-preferences.xml b/src/virt-viewer-preferences.xml new file mode 100644 index 0000000..f9738c5 --- /dev/null +++ b/src/virt-viewer-preferences.xml @@ -0,0 +1,134 @@ + + + + + + False + 5 + Preferences + normal + + + + True + False + + + True + False + end + + + + + + + + + True + True + 0 + + + + + True + True + + + True + False + 18 + 6 + + + True + False + 0 + Folder sharing + + + + + + False + False + 0 + + + + + True + False + 6 + 2 + 2 + 12 + 6 + + + Share folder + True + True + False + True + + + + + + + + Read-only + True + True + False + True + + + 2 + 1 + 2 + + + + + True + False + select-folder + + + 1 + 2 + + + + + False + False + 1 + + + + + + + True + False + Spice + + + False + + + + + True + True + 1 + + + + + + diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c index 2d4e67d..b9cae5e 100644 --- a/src/virt-viewer-session-spice.c +++ b/src/virt-viewer-session-spice.c @@ -44,10 +44,6 @@ #include "gbinding.c" #endif -#ifndef SPICE_GTK_CHECK_VERSION -#define SPICE_GTK_CHECK_VERSION(x, y, z) 0 -#endif - G_DEFINE_TYPE (VirtViewerSessionSpice, virt_viewer_session_spice, VIRT_VIEWER_TYPE_SESSION) @@ -70,6 +66,7 @@ PROP_0, PROP_SPICE_SESSION, PROP_SW_SMARTCARD_READER, + PROP_MAIN_WINDOW }; @@ -88,7 +85,24 @@ static void virt_viewer_session_spice_smartcard_insert(VirtViewerSession *session); static void virt_viewer_session_spice_smartcard_remove(VirtViewerSession *session); static gboolean virt_viewer_session_spice_fullscreen_auto_conf(VirtViewerSessionSpice *self); -static void virt_viewer_session_spice_apply_monitor_geometry(VirtViewerSession *self, GdkRectangle *monitors, guint nmonitors); +static void virt_viewer_session_spice_apply_monitor_geometry(VirtViewerSession *self, GHashTable *monitors); + +static void virt_viewer_session_spice_clear_displays(VirtViewerSessionSpice *self) +{ + SpiceSession *session = self->priv->session; + GList *l; + GList *channels; + + channels = spice_session_get_channels(session); + for (l = channels; l != NULL; l = l->next) { + SpiceChannel *channel = SPICE_CHANNEL(l->data); + + g_object_set_data(G_OBJECT(channel), "virt-viewer-displays", NULL); + } + g_list_free(channels); + virt_viewer_session_clear_displays(VIRT_VIEWER_SESSION(self)); +} + static void virt_viewer_session_spice_get_property(GObject *object, guint property_id, @@ -104,6 +118,9 @@ case PROP_SW_SMARTCARD_READER: g_value_set_boolean(value, priv->has_sw_smartcard_reader); break; + case PROP_MAIN_WINDOW: + g_value_set_object(value, self->priv->main_window); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -113,7 +130,12 @@ virt_viewer_session_spice_set_property(GObject *object, guint property_id, const GValue *value G_GNUC_UNUSED, GParamSpec *pspec) { + VirtViewerSessionSpice *self = VIRT_VIEWER_SESSION_SPICE(object); + switch (property_id) { + case PROP_MAIN_WINDOW: + self->priv->main_window = g_value_dup_object(value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -132,8 +154,7 @@ spice->priv->audio = NULL; - if (spice->priv->main_window) - g_object_unref(spice->priv->main_window); + g_clear_object(&spice->priv->main_window); G_OBJECT_CLASS(virt_viewer_session_spice_parent_class)->dispose(obj); } @@ -143,6 +164,75 @@ virt_viewer_session_spice_mime_type(VirtViewerSession *self G_GNUC_UNUSED) { return "application/x-spice"; +} + +static gboolean +virt_viewer_session_spice_can_share_folder(VirtViewerSession *session) +{ + VirtViewerSessionSpice *self = VIRT_VIEWER_SESSION_SPICE(session); + + return spice_session_has_channel_type(self->priv->session, SPICE_CHANNEL_WEBDAV); +} + +static gboolean +virt_viewer_session_spice_can_retry_auth(VirtViewerSession *session G_GNUC_UNUSED) +{ + return TRUE; +} + +static void +create_spice_session(VirtViewerSessionSpice *self); + +static void +property_notify_do_auto_conf(GObject *gobject G_GNUC_UNUSED, + GParamSpec *pspec G_GNUC_UNUSED, + VirtViewerSessionSpice *self) +{ + virt_viewer_session_spice_fullscreen_auto_conf(self); +} + +static void +update_share_folder(VirtViewerSessionSpice *self) +{ + gboolean share; + SpiceSession *session = self->priv->session; + GList *l, *channels; + + g_object_get(self, "share-folder", &share, NULL); + + channels = spice_session_get_channels(session); + for (l = channels; l != NULL; l = l->next) { + SpiceChannel *channel = l->data; + + if (!SPICE_IS_WEBDAV_CHANNEL(channel)) + continue; + + if (share) + spice_channel_connect(channel); + else + spice_channel_disconnect(channel, SPICE_CHANNEL_NONE); + } + + g_list_free(channels); +} + +static void +virt_viewer_session_spice_constructed(GObject *obj) +{ + VirtViewerSessionSpice *self = VIRT_VIEWER_SESSION_SPICE(obj); + + create_spice_session(self); + + virt_viewer_signal_connect_object(virt_viewer_session_get_app(VIRT_VIEWER_SESSION(self)), + "notify::fullscreen", + G_CALLBACK(property_notify_do_auto_conf), + self, 0); + + virt_viewer_signal_connect_object(self, "notify::share-folder", + G_CALLBACK(update_share_folder), self, + G_CONNECT_SWAPPED); + + G_OBJECT_CLASS(virt_viewer_session_spice_parent_class)->constructed(obj); } static void @@ -154,6 +244,7 @@ oclass->get_property = virt_viewer_session_spice_get_property; oclass->set_property = virt_viewer_session_spice_set_property; oclass->dispose = virt_viewer_session_spice_dispose; + oclass->constructed = virt_viewer_session_spice_constructed; dclass->close = virt_viewer_session_spice_close; dclass->open_fd = virt_viewer_session_spice_open_fd; @@ -165,6 +256,8 @@ dclass->smartcard_remove = virt_viewer_session_spice_smartcard_remove; dclass->mime_type = virt_viewer_session_spice_mime_type; dclass->apply_monitor_geometry = virt_viewer_session_spice_apply_monitor_geometry; + dclass->can_share_folder = virt_viewer_session_spice_can_share_folder; + dclass->can_retry_auth = virt_viewer_session_spice_can_retry_auth; g_type_class_add_private(klass, sizeof(VirtViewerSessionSpicePrivate)); @@ -176,6 +269,14 @@ SPICE_TYPE_SESSION, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(oclass, + PROP_MAIN_WINDOW, + g_param_spec_object("main-window", + "main window", + "Main Window", + GTK_TYPE_WINDOW, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); g_object_class_override_property(oclass, PROP_SW_SMARTCARD_READER, "software-smartcard-reader"); @@ -233,6 +334,51 @@ } } +#define UUID_LEN 16 +static void +uuid_changed(GObject *gobject G_GNUC_UNUSED, + GParamSpec *pspec G_GNUC_UNUSED, + VirtViewerSessionSpice *self) +{ + guint8* uuid = NULL; + VirtViewerApp* app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(self)); + + g_object_get(self->priv->session, "uuid", &uuid, NULL); + if (uuid) { + int i; + gboolean uuid_empty = TRUE; + + for (i = 0; i < UUID_LEN; i++) { + if (uuid[i] != 0) { + uuid_empty = FALSE; + break; + } + } + + if (!uuid_empty) { + gchar *uuid_str = spice_uuid_to_string(uuid); + g_object_set(app, "uuid", uuid_str, NULL); + g_free(uuid_str); + } + } + + virt_viewer_session_spice_fullscreen_auto_conf(self); +} + +static void +name_changed(GObject *gobject G_GNUC_UNUSED, + GParamSpec *pspec G_GNUC_UNUSED, + VirtViewerSessionSpice *self) +{ + gchar *name = NULL; + VirtViewerApp *app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(self)); + + g_object_get(self->priv->session, "name", &name, NULL); + + g_object_set(app, "guest-name", name, NULL); + g_free(name); +} + static void create_spice_session(VirtViewerSessionSpice *self) { @@ -249,16 +395,16 @@ g_object_set(self->priv->gtk_session, "auto-clipboard", TRUE, NULL); virt_viewer_signal_connect_object(self->priv->session, "channel-new", - G_CALLBACK(virt_viewer_session_spice_channel_new), self, 0); + G_CALLBACK(virt_viewer_session_spice_channel_new), self, 0); virt_viewer_signal_connect_object(self->priv->session, "channel-destroy", - G_CALLBACK(virt_viewer_session_spice_channel_destroy), self, 0); + G_CALLBACK(virt_viewer_session_spice_channel_destroy), self, 0); usb_manager = spice_usb_device_manager_get(self->priv->session, NULL); if (usb_manager) { - g_signal_connect(usb_manager, "auto-connect-failed", - G_CALLBACK(usb_connect_failed), self); - g_signal_connect(usb_manager, "device-error", - G_CALLBACK(usb_connect_failed), self); + virt_viewer_signal_connect_object(usb_manager, "auto-connect-failed", + G_CALLBACK(usb_connect_failed), self, 0); + virt_viewer_signal_connect_object(usb_manager, "device-error", + G_CALLBACK(usb_connect_failed), self, 0); } g_object_bind_property(self, "auto-usbredir", self->priv->gtk_session, "auto-usbredir", @@ -268,10 +414,10 @@ if (smartcard_manager) { GList *readers; GList *it; - g_signal_connect(smartcard_manager, "reader-added", - (GCallback)reader_added_cb, self); - g_signal_connect(smartcard_manager, "reader-removed", - (GCallback)reader_removed_cb, self); + virt_viewer_signal_connect_object(smartcard_manager, "reader-added", + G_CALLBACK(reader_added_cb), self, 0); + virt_viewer_signal_connect_object(smartcard_manager, "reader-removed", + G_CALLBACK(reader_removed_cb), self, 0); readers = spice_smartcard_manager_get_readers(smartcard_manager); for (it = readers; it != NULL; it = it->next) { SpiceSmartcardReader *reader; @@ -283,6 +429,21 @@ } g_list_free(readers); } + + /* notify::uuid is guaranteed to be emitted during connection startup even + * if the server is too old to support sending uuid */ + virt_viewer_signal_connect_object(self->priv->session, "notify::uuid", + G_CALLBACK(uuid_changed), self, 0); + virt_viewer_signal_connect_object(self->priv->session, "notify::name", + G_CALLBACK(name_changed), self, 0); + + g_object_bind_property(self->priv->session, "shared-dir", + self, "shared-folder", + G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); + g_object_bind_property(self->priv->session, "share-dir-ro", + self, "share-folder-ro", + G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); + } static void @@ -292,15 +453,22 @@ g_return_if_fail(self != NULL); - virt_viewer_session_clear_displays(session); + g_object_add_weak_pointer(G_OBJECT(self), (gpointer*)&self); + + virt_viewer_session_spice_clear_displays(self); if (self->priv->session) { spice_session_disconnect(self->priv->session); + if (!self) + return; + g_object_unref(self->priv->session); self->priv->session = NULL; self->priv->gtk_session = NULL; self->priv->audio = NULL; } + + g_object_remove_weak_pointer(G_OBJECT(self), (gpointer*)&self); /* FIXME: version 0.7 of spice-gtk allows reuse of session */ create_spice_session(self); @@ -348,6 +516,13 @@ g_object_set(G_OBJECT(session), "tls-port", tls_port, NULL); g_free(tls_port); } + + if (virt_viewer_file_is_set(file, "username")) { + gchar *val = virt_viewer_file_get_username(file); + g_object_set(G_OBJECT(session), "username", val, NULL); + g_free(val); + } + if (virt_viewer_file_is_set(file, "password")) { gchar *val = virt_viewer_file_get_password(file); g_object_set(G_OBJECT(session), "password", val, NULL); @@ -365,7 +540,10 @@ g_return_if_fail(ca != NULL); GByteArray *ba = g_byte_array_new_take((guint8 *)ca, strlen(ca) + 1); - g_object_set(G_OBJECT(session), "ca", ba, NULL); + g_object_set(G_OBJECT(session), + "ca", ba, + "ca-file", NULL, + NULL); g_byte_array_unref(ba); } @@ -473,13 +651,14 @@ } static void -virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED, +virt_viewer_session_spice_main_channel_event(SpiceChannel *channel, SpiceChannelEvent event, VirtViewerSession *session) { VirtViewerSessionSpice *self = VIRT_VIEWER_SESSION_SPICE(session); gchar *password = NULL, *user = NULL; - int ret; + gboolean ret; + static gboolean username_required = FALSE; g_return_if_fail(self != NULL); @@ -491,7 +670,7 @@ case SPICE_CHANNEL_CLOSED: g_debug("main channel: closed"); /* Ensure the other channels get closed too */ - virt_viewer_session_clear_displays(session); + virt_viewer_session_spice_clear_displays(self); if (self->priv->session) spice_session_disconnect(self->priv->session); break; @@ -499,22 +678,45 @@ g_debug("main channel: switching host"); break; case SPICE_CHANNEL_ERROR_AUTH: - g_debug("main channel: auth failure (wrong password?)"); + { + const GError *error = NULL; + g_debug("main channel: auth failure (wrong username/password?)"); + + { + error = spice_channel_get_error(channel); + username_required = g_error_matches(error, + SPICE_CLIENT_ERROR, + SPICE_CLIENT_ERROR_AUTH_NEEDS_PASSWORD_AND_USERNAME); + } if (self->priv->pass_try > 0) - g_signal_emit_by_name(session, "session-auth-failed", - _("invalid password")); + g_signal_emit_by_name(session, "session-auth-refused", + error != NULL ? error->message : _("Invalid password")); self->priv->pass_try++; + + /* The username is firstly pre-filled with the username of the current + * user and in case where some authentication error happened, the + * username entry will be prefilled with the last username used. + * Unfortunately, we don't have a clear way to differantiate bewteen + * invalid username and invalid password. So, in both cases the username + * entry will be pre-filled with the username used in the previous attempt. */ + if (username_required) { + g_object_get(self->priv->session, "username", &user, NULL); + if (user == NULL || *user == '\0') + user = g_strdup(g_get_user_name()); + } ret = virt_viewer_auth_collect_credentials(self->priv->main_window, "SPICE", NULL, - NULL, &password); - if (ret < 0) { + username_required ? &user : NULL, + &password); + if (!ret) { g_signal_emit_by_name(session, "session-cancelled"); } else { gboolean openfd; + g_object_set(self->priv->session, "username", user, NULL); g_object_set(self->priv->session, "password", password, NULL); g_object_get(self->priv->session, "client-sockets", &openfd, NULL); @@ -524,8 +726,8 @@ spice_session_connect(self->priv->session); } break; + } case SPICE_CHANNEL_ERROR_CONNECT: -#if SPICE_GTK_CHECK_VERSION(0, 23, 21) { const GError *error = spice_channel_get_error(channel); @@ -539,7 +741,7 @@ ret = virt_viewer_auth_collect_credentials(self->priv->main_window, "proxy", NULL, &user, &password); - if (ret < 0) { + if (!ret) { g_signal_emit_by_name(session, "session-cancelled"); } else { spice_uri_set_user(proxy, user); @@ -547,18 +749,14 @@ spice_session_connect(self->priv->session); } } else { - g_signal_emit_by_name(session, "session-disconnected", error->message); + virt_viewer_session_spice_channel_destroy(NULL, channel, session); } - } -#else - g_debug("main channel: failed to connect"); - g_signal_emit_by_name(session, "session-disconnected", NULL); -#endif break; + } case SPICE_CHANNEL_ERROR_IO: case SPICE_CHANNEL_ERROR_LINK: case SPICE_CHANNEL_ERROR_TLS: - g_signal_emit_by_name(session, "session-disconnected", NULL); + virt_viewer_session_spice_channel_destroy(NULL, channel, session); break; default: g_warning("unhandled spice main channel event: %d", event); @@ -597,13 +795,13 @@ usb_device_widget = spice_usb_device_widget_new(priv->session, "%s %s"); - g_signal_connect(usb_device_widget, "connect-failed", - G_CALLBACK(usb_connect_failed), self); + virt_viewer_signal_connect_object(usb_device_widget, "connect-failed", + G_CALLBACK(usb_connect_failed), self, 0); gtk_box_pack_start(GTK_BOX(area), usb_device_widget, TRUE, TRUE, 0); /* This shrinks the dialog when USB devices are unplugged */ - g_signal_connect(usb_device_widget, "remove", - G_CALLBACK(remove_cb), dialog); + virt_viewer_signal_connect_object(usb_device_widget, "remove", + G_CALLBACK(remove_cb), dialog, 0); /* show and run */ gtk_widget_show_all(dialog); @@ -616,8 +814,17 @@ GParamSpec *pspec G_GNUC_UNUSED, VirtViewerSessionSpice *self) { + gboolean agent_connected; + // this will force refresh of application menu g_signal_emit_by_name(self, "session-display-updated"); + + g_object_get(cmain, "agent-connected", &agent_connected, NULL); + if (agent_connected) { + /* this will force update displays geometry when the agent has connected + * after the application (eg: rebooting the guest) */ + virt_viewer_session_update_displays_geometry(VIRT_VIEWER_SESSION(self)); + } } static void @@ -629,6 +836,16 @@ g_debug("Destroying spice display %p", display); virt_viewer_session_remove_display(session, display); g_object_unref(display); +} + +static gboolean +display_is_in_fullscreen_mode(VirtViewerSessionSpice *self, + VirtViewerDisplay *display) +{ + gint nth = virt_viewer_display_get_nth(display); + VirtViewerApp *app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(self)); + + return virt_viewer_app_get_initial_monitor_for_display(app, nth) != -1; } static void @@ -640,6 +857,8 @@ GPtrArray *displays = NULL; GtkWidget *display; guint i, monitors_max; + gboolean fullscreen_mode = + virt_viewer_app_get_fullscreen(virt_viewer_session_get_app(VIRT_VIEWER_SESSION(self))); g_object_get(channel, "monitors", &monitors, @@ -662,25 +881,38 @@ display = g_ptr_array_index(displays, i); if (display == NULL) { display = virt_viewer_display_spice_new(self, channel, i); - g_debug("creating spice display (#:%d)", i); + g_debug("creating spice display (#:%d)", + virt_viewer_display_get_nth(VIRT_VIEWER_DISPLAY(display))); g_ptr_array_index(displays, i) = g_object_ref_sink(display); + virt_viewer_session_add_display(VIRT_VIEWER_SESSION(self), + VIRT_VIEWER_DISPLAY(display)); } - - virt_viewer_session_add_display(VIRT_VIEWER_SESSION(self), - VIRT_VIEWER_DISPLAY(display)); } for (i = 0; i < monitors->len; i++) { SpiceDisplayMonitorConfig *monitor = &g_array_index(monitors, SpiceDisplayMonitorConfig, i); + gboolean disabled = monitor->width == 0 || monitor->height == 0; display = g_ptr_array_index(displays, monitor->id); g_return_if_fail(display != NULL); - if (monitor->width == 0 || monitor->height == 0) + if (!disabled && fullscreen_mode && self->priv->did_auto_conf && + !display_is_in_fullscreen_mode(self, VIRT_VIEWER_DISPLAY(display))) { + g_warning("display %d should not be enabled, disabling", + virt_viewer_display_get_nth(VIRT_VIEWER_DISPLAY(display))); + spice_main_set_display_enabled(virt_viewer_session_spice_get_main_channel(self), + virt_viewer_display_get_nth(VIRT_VIEWER_DISPLAY(display)), + FALSE); + disabled = TRUE; + } + + virt_viewer_display_set_enabled(VIRT_VIEWER_DISPLAY(display), !disabled); + + if (disabled) continue; - virt_viewer_display_set_enabled(VIRT_VIEWER_DISPLAY(display), TRUE); - virt_viewer_display_set_desktop_size(VIRT_VIEWER_DISPLAY(display), - monitor->width, monitor->height); + virt_viewer_display_spice_set_desktop(VIRT_VIEWER_DISPLAY(display), + monitor->x, monitor->y, + monitor->width, monitor->height); } g_clear_pointer(&monitors, g_array_unref); @@ -697,8 +929,8 @@ g_return_if_fail(self != NULL); - g_signal_connect(channel, "open-fd", - G_CALLBACK(virt_viewer_session_spice_channel_open_fd_request), self); + virt_viewer_signal_connect_object(channel, "open-fd", + G_CALLBACK(virt_viewer_session_spice_channel_open_fd_request), self, 0); g_object_get(channel, "channel-id", &id, NULL); @@ -709,22 +941,23 @@ g_signal_handlers_disconnect_by_func(self->priv->main_channel, virt_viewer_session_spice_main_channel_event, self); - g_signal_connect(channel, "channel-event", - G_CALLBACK(virt_viewer_session_spice_main_channel_event), self); + virt_viewer_signal_connect_object(channel, "channel-event", + G_CALLBACK(virt_viewer_session_spice_main_channel_event), self, 0); self->priv->main_channel = SPICE_MAIN_CHANNEL(channel); g_object_set(G_OBJECT(channel), "disable-display-position", FALSE, "disable-display-align", TRUE, NULL); - g_signal_connect(channel, "notify::agent-connected", G_CALLBACK(agent_connected_changed), self); + virt_viewer_signal_connect_object(channel, "notify::agent-connected", + G_CALLBACK(agent_connected_changed), self, 0); } if (SPICE_IS_DISPLAY_CHANNEL(channel)) { g_signal_emit_by_name(session, "session-initialized"); - g_signal_connect(channel, "notify::monitors", - G_CALLBACK(virt_viewer_session_spice_display_monitors), self); + virt_viewer_signal_connect_object(channel, "notify::monitors", + G_CALLBACK(virt_viewer_session_spice_display_monitors), self, 0); spice_channel_connect(channel); } @@ -749,24 +982,18 @@ self->priv->channel_count++; } -static void -property_notify_do_auto_conf(GObject *gobject G_GNUC_UNUSED, - GParamSpec *pspec G_GNUC_UNUSED, - VirtViewerSessionSpice *self) -{ - virt_viewer_session_spice_fullscreen_auto_conf(self); -} - static gboolean virt_viewer_session_spice_fullscreen_auto_conf(VirtViewerSessionSpice *self) { GdkScreen *screen = gdk_screen_get_default(); SpiceMainChannel* cmain = virt_viewer_session_spice_get_main_channel(self); VirtViewerApp *app = NULL; - GdkRectangle dest; + GHashTable *displays; + GHashTableIter iter; + gpointer key, value; gboolean agent_connected; - gint i; - gsize ndisplays = 0; + GList *initial_displays, *l; + guint ndisplays; /* only do auto-conf once at startup. Avoid repeating auto-conf later due to * agent disconnection/re-connection, etc */ @@ -789,23 +1016,42 @@ g_object_get(cmain, "agent-connected", &agent_connected, NULL); if (!agent_connected) { g_debug("Agent not connected, skipping autoconf"); - g_signal_connect(cmain, "notify::agent-connected", G_CALLBACK(property_notify_do_auto_conf), self); + virt_viewer_signal_connect_object(cmain, "notify::agent-connected", + G_CALLBACK(property_notify_do_auto_conf), self, 0); return FALSE; } spice_main_set_display_enabled(cmain, -1, FALSE); - ndisplays = virt_viewer_app_get_n_initial_displays(app); - g_debug("Performing full screen auto-conf, %" G_GSIZE_FORMAT " host monitors", ndisplays); - - for (i = 0; i < ndisplays; i++) { - gint j = virt_viewer_app_get_initial_monitor_for_display(app, i); - gdk_screen_get_monitor_geometry(screen, j, &dest); + initial_displays = virt_viewer_app_get_initial_displays(app); + ndisplays = g_list_length(initial_displays); + g_debug("Performing full screen auto-conf, %u host monitors", ndisplays); + displays = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free); + + for (l = initial_displays; l != NULL; l = l->next) { + GdkRectangle* rect = g_new0(GdkRectangle, 1);; + gint j = virt_viewer_app_get_initial_monitor_for_display(app, GPOINTER_TO_INT(l->data)); + if (j == -1) + continue; + + gdk_screen_get_monitor_geometry(screen, j, rect); + g_hash_table_insert(displays, l->data, rect); + } + + virt_viewer_shift_monitors_to_origin(displays); + + g_hash_table_iter_init(&iter, displays); + while (g_hash_table_iter_next(&iter, &key, &value)) { + GdkRectangle *rect = value; + gint j = GPOINTER_TO_INT(key); + + spice_main_set_display(cmain, j, rect->x, rect->y, rect->width, rect->height); + spice_main_set_display_enabled(cmain, j, TRUE); g_debug("Set SPICE display %d to (%d,%d)-(%dx%d)", - i, dest.x, dest.y, dest.width, dest.height); - spice_main_set_display(cmain, i, dest.x, dest.y, dest.width, dest.height); - spice_main_set_display_enabled(cmain, i, TRUE); - } + j, rect->x, rect->y, rect->width, rect->height); + } + g_list_free(initial_displays); + g_hash_table_unref(displays); spice_main_send_monitor_config(cmain); self->priv->did_auto_conf = TRUE; @@ -819,11 +1065,14 @@ { VirtViewerSessionSpice *self = VIRT_VIEWER_SESSION_SPICE(session); int id; + const GError *error; g_return_if_fail(self != NULL); g_object_get(channel, "channel-id", &id, NULL); g_debug("Destroy SPICE channel %s %d", g_type_name(G_OBJECT_TYPE(channel)), id); + + error = spice_channel_get_error(channel); if (SPICE_IS_MAIN_CHANNEL(channel)) { g_debug("zap main channel"); @@ -850,38 +1099,7 @@ self->priv->channel_count--; if (self->priv->channel_count == 0) - g_signal_emit_by_name(self, "session-disconnected", NULL); -} - -#define UUID_LEN 16 -static void -uuid_changed(GObject *gobject G_GNUC_UNUSED, - GParamSpec *pspec G_GNUC_UNUSED, - VirtViewerSessionSpice *self) -{ - guint8* uuid = NULL; - VirtViewerApp* app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(self)); - - g_object_get(self->priv->session, "uuid", &uuid, NULL); - if (uuid) { - int i; - gboolean uuid_empty = TRUE; - - for (i = 0; i < UUID_LEN; i++) { - if (uuid[i] != 0) { - uuid_empty = FALSE; - break; - } - } - - if (!uuid_empty) { - gchar* uuid_str = spice_uuid_to_string(uuid); - virt_viewer_app_set_uuid_string(app, uuid_str); - g_free(uuid_str); - } - } - - virt_viewer_session_spice_fullscreen_auto_conf(self); + g_signal_emit_by_name(self, "session-disconnected", error ? error->message : NULL); } VirtViewerSession * @@ -889,17 +1107,10 @@ { VirtViewerSessionSpice *self; - self = g_object_new(VIRT_VIEWER_TYPE_SESSION_SPICE, "app", app, NULL); - - create_spice_session(self); - self->priv->main_window = g_object_ref(main_window); - - g_signal_connect(app, "notify::fullscreen", G_CALLBACK(property_notify_do_auto_conf), self); - - /* notify::uuid is guaranteed to be emitted during connection startup even - * if the server is too old to support sending uuid */ - g_signal_connect(self->priv->session, "notify::uuid", G_CALLBACK(uuid_changed), self); - + self = g_object_new(VIRT_VIEWER_TYPE_SESSION_SPICE, + "app", app, + "main-window", main_window, + NULL); return VIRT_VIEWER_SESSION(self); } @@ -923,14 +1134,17 @@ spice_smartcard_manager_remove_card(spice_smartcard_manager_get()); } -void -virt_viewer_session_spice_apply_monitor_geometry(VirtViewerSession *session, GdkRectangle *monitors, guint nmonitors) -{ - guint i; +static void +virt_viewer_session_spice_apply_monitor_geometry(VirtViewerSession *session, GHashTable *monitors) +{ + GHashTableIter iter; + gpointer key = NULL, value = NULL; VirtViewerSessionSpice *self = VIRT_VIEWER_SESSION_SPICE(session); - for (i = 0; i < nmonitors; i++) { - GdkRectangle* rect = &monitors[i]; + g_hash_table_iter_init(&iter, monitors); + while (g_hash_table_iter_next(&iter, &key, &value)) { + gint i = GPOINTER_TO_INT(key); + GdkRectangle* rect = value; spice_main_set_display(self->priv->main_channel, i, rect->x, rect->y, rect->width, rect->height); diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c index e2f90f2..3321fc2 100644 --- a/src/virt-viewer-session-vnc.c +++ b/src/virt-viewer-session-vnc.c @@ -98,7 +98,12 @@ virt_viewer_session_vnc_connected(VncDisplay *vnc G_GNUC_UNUSED, VirtViewerSessionVnc *session) { - GtkWidget *display = virt_viewer_display_vnc_new(session->priv->vnc); + GtkWidget *display = virt_viewer_display_vnc_new(session, session->priv->vnc); + VirtViewerApp *app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(session)); + + virt_viewer_window_set_display(virt_viewer_app_get_main_window(app), + VIRT_VIEWER_DISPLAY(display)); + g_signal_emit_by_name(session, "session-connected"); virt_viewer_session_add_display(VIRT_VIEWER_SESSION(session), VIRT_VIEWER_DISPLAY(display)); @@ -111,7 +116,7 @@ GtkWidget *display; virt_viewer_session_clear_displays(VIRT_VIEWER_SESSION(session)); - display = virt_viewer_display_vnc_new(session->priv->vnc); + display = virt_viewer_display_vnc_new(session, session->priv->vnc); g_debug("Disconnected"); g_signal_emit_by_name(session, "session-disconnected", NULL); virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(display), @@ -147,7 +152,7 @@ { gchar *msg = g_strdup_printf(_("Unsupported authentication type %d"), authType); - g_signal_emit_by_name(session, "session-auth-failed", msg); + g_signal_emit_by_name(session, "session-auth-unsupported", msg); g_free(msg); } @@ -283,9 +288,13 @@ VirtViewerFile *file = virt_viewer_session_get_file(VIRT_VIEWER_SESSION(self)); if (file != NULL) { - if (wantUsername && virt_viewer_file_is_set(file, "username")) { - username = virt_viewer_file_get_username(file); - wantUsername = FALSE; + if (wantUsername) { + if (virt_viewer_file_is_set(file, "username")) { + username = virt_viewer_file_get_username(file); + wantUsername = FALSE; + } else { + username = g_strdup(g_get_user_name()); + } } if (wantPassword && virt_viewer_file_is_set(file, "password")) { password = virt_viewer_file_get_password(file); @@ -294,13 +303,14 @@ } if (wantUsername || wantPassword) { - int ret = virt_viewer_auth_collect_credentials(self->priv->main_window, - "VNC", NULL, - wantUsername ? &username : NULL, - wantPassword ? &password : NULL); - - if (ret < 0) { + gboolean ret = virt_viewer_auth_collect_credentials(self->priv->main_window, + "VNC", NULL, + wantUsername ? &username : NULL, + wantPassword ? &password : NULL); + + if (!ret) { vnc_display_close(self->priv->vnc); + g_signal_emit_by_name(self, "session-cancelled"); goto cleanup; } } diff --git a/src/virt-viewer-session.c b/src/virt-viewer-session.c index c432719..92ffd3f 100644 --- a/src/virt-viewer-session.c +++ b/src/virt-viewer-session.c @@ -41,6 +41,9 @@ gboolean has_usbredir; gchar *uri; VirtViewerFile *file; + gboolean share_folder; + gchar *shared_folder; + gboolean share_folder_ro; }; G_DEFINE_ABSTRACT_TYPE(VirtViewerSession, virt_viewer_session, G_TYPE_OBJECT) @@ -53,6 +56,9 @@ PROP_HAS_USBREDIR, PROP_FILE, PROP_SW_SMARTCARD_READER, + PROP_SHARE_FOLDER, + PROP_SHARED_FOLDER, + PROP_SHARE_FOLDER_RO, }; static void @@ -69,6 +75,7 @@ g_free(session->priv->uri); g_clear_object(&session->priv->file); + g_free(session->priv->shared_folder); G_OBJECT_CLASS(virt_viewer_session_parent_class)->finalize(obj); } @@ -98,6 +105,19 @@ virt_viewer_session_set_file(self, g_value_get_object(value)); break; + case PROP_SHARE_FOLDER: + self->priv->share_folder = g_value_get_boolean(value); + break; + + case PROP_SHARED_FOLDER: + g_free(self->priv->shared_folder); + self->priv->shared_folder = g_value_dup_string(value); + break; + + case PROP_SHARE_FOLDER_RO: + self->priv->share_folder_ro = g_value_get_boolean(value); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -131,6 +151,18 @@ case PROP_SW_SMARTCARD_READER: g_value_set_boolean(value, FALSE); + break; + + case PROP_SHARE_FOLDER: + g_value_set_boolean(value, self->priv->share_folder); + break; + + case PROP_SHARED_FOLDER: + g_value_set_string(value, self->priv->shared_folder); + break; + + case PROP_SHARE_FOLDER_RO: + g_value_set_boolean(value, self->priv->share_folder_ro); break; default: @@ -197,6 +229,33 @@ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, + PROP_SHARE_FOLDER, + g_param_spec_boolean("share-folder", + "Share folder", + "Indicates whether to share folder", + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, + PROP_SHARED_FOLDER, + g_param_spec_string("shared-folder", + "Shared folder", + "Indicates the shared folder", + g_get_user_special_dir(G_USER_DIRECTORY_PUBLIC_SHARE), + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, + PROP_SHARE_FOLDER_RO, + g_param_spec_boolean("share-folder-ro", + "Share folder read-only", + "Indicates whether to share folder in read-only", + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + g_signal_new("session-connected", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, @@ -246,10 +305,10 @@ 1, G_TYPE_STRING); - g_signal_new("session-auth-failed", - G_OBJECT_CLASS_TYPE(object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_HOOKS, - G_STRUCT_OFFSET(VirtViewerSessionClass, session_auth_failed), + g_signal_new("session-auth-unsupported", + G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_NO_HOOKS, + G_STRUCT_OFFSET(VirtViewerSessionClass, session_auth_unsupported), NULL, NULL, g_cclosure_marshal_VOID__STRING, @@ -339,99 +398,43 @@ session->priv = VIRT_VIEWER_SESSION_GET_PRIVATE(session); } -/* simple sorting of monitors. Primary sort left-to-right, secondary sort from - * top-to-bottom, finally by monitor id */ -static int -displays_cmp(const void *p1, const void *p2, gpointer user_data) -{ - guint diff; - GdkRectangle *displays = user_data; - guint i = *(guint*)p1; - guint j = *(guint*)p2; - GdkRectangle *m1 = &displays[i]; - GdkRectangle *m2 = &displays[j]; - diff = m1->x - m2->x; - if (diff == 0) - diff = m1->y - m2->y; - if (diff == 0) - diff = i - j; - - return diff; -} - -static void -virt_viewer_session_align_monitors_linear(GdkRectangle *displays, guint ndisplays) -{ - gint i, x = 0; - guint *sorted_displays; - - g_return_if_fail(displays != NULL); - - if (ndisplays == 0) - return; - - sorted_displays = g_new0(guint, ndisplays); - for (i = 0; i < ndisplays; i++) - sorted_displays[i] = i; - g_qsort_with_data(sorted_displays, ndisplays, sizeof(guint), displays_cmp, displays); - - /* adjust monitor positions so that there's no gaps or overlap between - * monitors */ - for (i = 0; i < ndisplays; i++) { - guint nth = sorted_displays[i]; - g_assert(nth < ndisplays); - GdkRectangle *rect = &displays[nth]; - rect->x = x; - rect->y = 0; - x += rect->width; - } - g_free(sorted_displays); -} - static void virt_viewer_session_on_monitor_geometry_changed(VirtViewerSession* self, VirtViewerDisplay* display G_GNUC_UNUSED) { VirtViewerSessionClass *klass; gboolean all_fullscreen = TRUE; - guint nmonitors = 0; - GdkRectangle *monitors = NULL; + /* GHashTable */ + GHashTable *monitors; GList *l; klass = VIRT_VIEWER_SESSION_GET_CLASS(self); if (!klass->apply_monitor_geometry) return; - /* find highest monitor ID so we can create the sparse array */ + monitors = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free); + for (l = self->priv->displays; l; l = l->next) { VirtViewerDisplay *d = VIRT_VIEWER_DISPLAY(l->data); guint nth = 0; + GdkRectangle *rect = g_new0(GdkRectangle, 1); + g_object_get(d, "nth-display", &nth, NULL); - - nmonitors = MAX(nth + 1, nmonitors); - } - - monitors = g_new0(GdkRectangle, nmonitors); - for (l = self->priv->displays; l; l = l->next) { - VirtViewerDisplay *d = VIRT_VIEWER_DISPLAY(l->data); - guint nth = 0; - GdkRectangle *rect = NULL; - - g_object_get(d, "nth-display", &nth, NULL); - g_return_if_fail(nth < nmonitors); - rect = &monitors[nth]; virt_viewer_display_get_preferred_monitor_geometry(d, rect); if (virt_viewer_display_get_enabled(d) && !virt_viewer_display_get_fullscreen(d)) all_fullscreen = FALSE; + g_hash_table_insert(monitors, GINT_TO_POINTER(nth), rect); } if (!all_fullscreen) - virt_viewer_session_align_monitors_linear(monitors, nmonitors); - - klass->apply_monitor_geometry(self, monitors, nmonitors); - g_free(monitors); + virt_viewer_align_monitors_linear(monitors); + + virt_viewer_shift_monitors_to_origin(monitors); + + klass->apply_monitor_geometry(self, monitors); + g_hash_table_unref(monitors); } void virt_viewer_session_add_display(VirtViewerSession *session, @@ -476,6 +479,10 @@ session->priv->displays = NULL; } +void virt_viewer_session_update_displays_geometry(VirtViewerSession *session) +{ + virt_viewer_session_on_monitor_geometry_changed(session, NULL); +} void virt_viewer_session_close(VirtViewerSession *session) @@ -646,6 +653,28 @@ g_return_val_if_fail(VIRT_VIEWER_IS_SESSION(self), NULL); return self->priv->file; +} + +gboolean virt_viewer_session_can_share_folder(VirtViewerSession *self) +{ + VirtViewerSessionClass *klass; + + g_return_val_if_fail(VIRT_VIEWER_IS_SESSION(self), FALSE); + + klass = VIRT_VIEWER_SESSION_GET_CLASS(self); + + return klass->can_share_folder ? klass->can_share_folder(self) : FALSE; +} + +gboolean virt_viewer_session_can_retry_auth(VirtViewerSession *self) +{ + VirtViewerSessionClass *klass; + + g_return_val_if_fail(VIRT_VIEWER_IS_SESSION(self), FALSE); + + klass = VIRT_VIEWER_SESSION_GET_CLASS(self); + + return klass->can_retry_auth ? klass->can_retry_auth(self) : FALSE; } /* diff --git a/src/virt-viewer-session.h b/src/virt-viewer-session.h index 316fdf0..d3a9ccc 100644 --- a/src/virt-viewer-session.h +++ b/src/virt-viewer-session.h @@ -80,7 +80,7 @@ void (*session_initialized)(VirtViewerSession *session); void (*session_disconnected)(VirtViewerSession *session, const gchar *msg); void (*session_auth_refused)(VirtViewerSession *session, const gchar *msg); - void (*session_auth_failed)(VirtViewerSession *session, const gchar *msg); + void (*session_auth_unsupported)(VirtViewerSession *session, const gchar *msg); void (*session_usb_failed)(VirtViewerSession *session, const gchar *msg); void (*session_channel_open)(VirtViewerSession *session, VirtViewerSessionChannel *channel); @@ -94,7 +94,10 @@ void (*session_cut_text)(VirtViewerSession *session, const gchar *str); void (*session_bell)(VirtViewerSession *session); void (*session_cancelled)(VirtViewerSession *session); - void (*apply_monitor_geometry)(VirtViewerSession *session, GdkRectangle* monitors, guint nmonitors); + /* monitors = GHashTable */ + void (*apply_monitor_geometry)(VirtViewerSession *session, GHashTable* monitors); + gboolean (*can_share_folder)(VirtViewerSession *session); + gboolean (*can_retry_auth)(VirtViewerSession *session); }; GType virt_viewer_session_get_type(void); @@ -107,6 +110,7 @@ void virt_viewer_session_remove_display(VirtViewerSession *session, VirtViewerDisplay *display); void virt_viewer_session_clear_displays(VirtViewerSession *session); +void virt_viewer_session_update_displays_geometry(VirtViewerSession *session); void virt_viewer_session_close(VirtViewerSession* session); gboolean virt_viewer_session_open_fd(VirtViewerSession* session, int fd); @@ -129,6 +133,8 @@ gchar* virt_viewer_session_get_uri(VirtViewerSession *self); void virt_viewer_session_set_file(VirtViewerSession *self, VirtViewerFile *file); VirtViewerFile* virt_viewer_session_get_file(VirtViewerSession *self); +gboolean virt_viewer_session_can_share_folder(VirtViewerSession *self); +gboolean virt_viewer_session_can_retry_auth(VirtViewerSession *self); G_END_DECLS diff --git a/src/virt-viewer-util.c b/src/virt-viewer-util.c index 6fdaa07..f2ccd13 100644 --- a/src/virt-viewer-util.c +++ b/src/virt-viewer-util.c @@ -1,7 +1,7 @@ /* * Virt Viewer: A virtual machine console viewer * - * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2007-2015 Red Hat, Inc. * Copyright (C) 2009-2012 Daniel P. Berrange * * This program is free software; you can redistribute it and/or modify @@ -117,7 +117,7 @@ g_return_val_if_fail(uri != NULL, 1); if (host) { - if (!uri || !uri->server) { + if (!uri->server) { *host = g_strdup("localhost"); } else { if (uri->server[0] == '[') { @@ -323,7 +323,7 @@ g_set_application_name(appname); - g_log_set_default_handler(log_handler, NULL); + g_log_set_handler(G_LOG_DOMAIN, G_LOG_LEVEL_MASK, log_handler, NULL); } static gchar * @@ -439,25 +439,24 @@ return accel; } -/** - * virt_viewer_compare_version: - * @s1: a version-like string - * @s2: a version-like string - * - * Compare two version-like strings: 1.1 > 1.0, 1.0.1 > 1.0, 1.10 > 1.7... - * - * String suffix (1.0rc1 etc) are not accepted, and will return 0. - * - * Returns: negative value if s1 < s2; zero if s1 = s2; positive value if s1 > s2. - **/ -gint +static gboolean str_is_empty(const gchar *str) +{ + return ((str == NULL) || (str[0] == '\0')); +} + +static gint virt_viewer_compare_version(const gchar *s1, const gchar *s2) { gint i, retval = 0; gchar **v1, **v2; - g_return_val_if_fail(s1 != NULL, 0); - g_return_val_if_fail(s2 != NULL, 0); + if (str_is_empty(s1) && str_is_empty(s2)) { + return 0; + } else if (str_is_empty(s1)) { + return -1; + } else if (str_is_empty(s2)) { + return 1; + } v1 = g_strsplit(s1, ".", -1); v2 = g_strsplit(s2, ".", -1); @@ -473,7 +472,7 @@ g_return_val_if_fail(e1 && e2, 0); if (*e1 || *e2) { - g_warning("the version string contains suffix"); + g_warning("the version string contains a suffix"); goto end; } } @@ -488,6 +487,163 @@ g_strfreev(v2); return retval; } + +/** + * virt_viewer_compare_buildid: + * @s1: a version-like string + * @s2: a version-like string + * + * Compare two buildid strings: 1.1-1 > 1.0-1, 1.0-2 > 1.0-1, 1.10 > 1.7... + * + * String suffix (1.0rc1 etc) are not accepted, and will return 0. + * + * Returns: negative value if s1 < s2; zero if s1 = s2; positive value if s1 > s2. + **/ +gint +virt_viewer_compare_buildid(const gchar *s1, const gchar *s2) +{ + int ret = 0; + GStrv split1 = NULL; + GStrv split2 = NULL; + + split1 = g_strsplit(s1, "-", 2); + split2 = g_strsplit(s2, "-", 2); + if ((split1 == NULL) || (split2 == NULL)) { + goto end; + } + /* Compare versions */ + ret = virt_viewer_compare_version(split1[0], split2[0]); + if (ret != 0) { + goto end; + } + if ((split1[0] == NULL) || (split2[0] == NULL)) { + goto end; + } + + /* Compare -release */ + ret = virt_viewer_compare_version(split1[1], split2[1]); + +end: + g_strfreev(split1); + g_strfreev(split2); + + return ret; +} + +/* simple sorting of monitors. Primary sort left-to-right, secondary sort from + * top-to-bottom, finally by monitor id */ +static int +displays_cmp(const void *p1, const void *p2, gpointer user_data) +{ + guint diff; + GHashTable *displays = user_data; + guint i = *(guint*)p1; + guint j = *(guint*)p2; + GdkRectangle *m1 = g_hash_table_lookup(displays, GINT_TO_POINTER(i)); + GdkRectangle *m2 = g_hash_table_lookup(displays, GINT_TO_POINTER(j)); + diff = m1->x - m2->x; + if (diff == 0) + diff = m1->y - m2->y; + if (diff == 0) + diff = i - j; + + return diff; +} + +static void find_max_id(gpointer key, + gpointer value G_GNUC_UNUSED, + gpointer user_data) +{ + guint *max_id = user_data; + guint id = GPOINTER_TO_INT(key); + *max_id = MAX(*max_id, id); +} + +void +virt_viewer_align_monitors_linear(GHashTable *displays) +{ + gint i, x = 0; + guint *sorted_displays; + guint max_id = 0; + guint ndisplays = 0; + GHashTableIter iter; + gpointer key, value; + + g_return_if_fail(displays != NULL); + + if (g_hash_table_size(displays) == 0) + return; + + g_hash_table_foreach(displays, find_max_id, &max_id); + ndisplays = max_id + 1; + + sorted_displays = g_new0(guint, ndisplays); + + g_hash_table_iter_init(&iter, displays); + while (g_hash_table_iter_next(&iter, &key, &value)) + sorted_displays[GPOINTER_TO_INT(key)] = GPOINTER_TO_INT(key); + + g_qsort_with_data(sorted_displays, ndisplays, sizeof(guint), displays_cmp, displays); + + /* adjust monitor positions so that there's no gaps or overlap between + * monitors */ + for (i = 0; i < ndisplays; i++) { + guint nth = sorted_displays[i]; + g_assert(nth < ndisplays); + GdkRectangle *rect = g_hash_table_lookup(displays, GINT_TO_POINTER(nth)); + rect->x = x; + rect->y = 0; + x += rect->width; + } + g_free(sorted_displays); +} + +/* Shift all displays so that the monitor origin is at (0,0). This reduces the + * size of the screen that will be required on the guest when all client + * monitors are fullscreen but do not begin at the origin. For example, instead + * of sending down the following configuration: + * 1280x1024+4240+0 + * (which implies that the guest screen must be at least 5520x1024), we'd send + * 1280x1024+0+0 + * (which implies the guest screen only needs to be 1280x1024). The first + * version might fail if the guest video memory is not large enough to handle a + * screen of that size. + */ +void +virt_viewer_shift_monitors_to_origin(GHashTable *displays) +{ + gint xmin = G_MAXINT; + gint ymin = G_MAXINT; + GHashTableIter iter; + gpointer key, value; + + if (g_hash_table_size(displays) == 0) + return; + + g_hash_table_iter_init(&iter, displays); + while (g_hash_table_iter_next(&iter, &key, &value)) { + GdkRectangle *display = value; + if (display->width > 0 && display->height > 0) { + xmin = MIN(xmin, display->x); + ymin = MIN(ymin, display->y); + } + } + g_return_if_fail(xmin < G_MAXINT && ymin < G_MAXINT); + + if (xmin > 0 || ymin > 0) { + g_debug("%s: Shifting all monitors by (%i, %i)", G_STRFUNC, xmin, ymin); + g_hash_table_iter_init(&iter, displays); + while (g_hash_table_iter_next(&iter, &key, &value)) { + GdkRectangle *display = value; + if (display->width > 0 && display->height > 0) { + display->x -= xmin; + display->y -= ymin; + } + } + } +} + + /* * Local variables: * c-indent-level: 4 diff --git a/src/virt-viewer-util.h b/src/virt-viewer-util.h index 287f9bd..f1cb08b 100644 --- a/src/virt-viewer-util.h +++ b/src/virt-viewer-util.h @@ -30,6 +30,7 @@ enum { VIRT_VIEWER_ERROR_FAILED, + VIRT_VIEWER_ERROR_CANCELLED, }; #define VIRT_VIEWER_ERROR virt_viewer_error_quark () @@ -53,7 +54,11 @@ GConnectFlags connect_flags); gchar* spice_hotkey_to_gtk_accelerator(const gchar *key); -gint virt_viewer_compare_version(const gchar *s1, const gchar *s2); +gint virt_viewer_compare_buildid(const gchar *s1, const gchar *s2); + +/* monitor alignment */ +void virt_viewer_align_monitors_linear(GHashTable *displays); +void virt_viewer_shift_monitors_to_origin(GHashTable *displays); #endif diff --git a/src/virt-viewer-vm-connection.c b/src/virt-viewer-vm-connection.c new file mode 100644 index 0000000..35d10ff --- /dev/null +++ b/src/virt-viewer-vm-connection.c @@ -0,0 +1,108 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2014 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include +#include + +#include "virt-viewer-vm-connection.h" +#include "virt-viewer-util.h" + +static void +treeview_row_activated_cb(GtkTreeView *treeview G_GNUC_UNUSED, + GtkTreePath *path G_GNUC_UNUSED, + GtkTreeViewColumn *col G_GNUC_UNUSED, + gpointer userdata) +{ + gtk_widget_activate(GTK_WIDGET(userdata)); +} + +static void +treeselection_changed_cb(GtkTreeSelection *selection, gpointer userdata) +{ + gtk_widget_set_sensitive(GTK_WIDGET(userdata), + gtk_tree_selection_count_selected_rows(selection) == 1); +} + +gchar* +virt_viewer_vm_connection_choose_name_dialog(GtkWindow *main_window, + GtkTreeModel *model, + GError **error) +{ + GtkBuilder *vm_connection; + GtkWidget *dialog; + GtkButton *button_connect; + GtkTreeView *treeview; + GtkTreeSelection *selection; + GtkTreeIter iter; + int dialog_response; + gchar *vm_name = NULL; + + g_return_val_if_fail(model != NULL, NULL); + + if (!gtk_tree_model_get_iter_first(model, &iter)) { + g_set_error_literal(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("No virtual machine found")); + return NULL; + } + + vm_connection = virt_viewer_util_load_ui("virt-viewer-vm-connection.xml"); + g_return_val_if_fail(vm_connection != NULL, NULL); + + dialog = GTK_WIDGET(gtk_builder_get_object(vm_connection, "vm-connection-dialog")); + gtk_window_set_transient_for(GTK_WINDOW(dialog), main_window); + button_connect = GTK_BUTTON(gtk_builder_get_object(vm_connection, "button-connect")); + treeview = GTK_TREE_VIEW(gtk_builder_get_object(vm_connection, "treeview")); + selection = GTK_TREE_SELECTION(gtk_builder_get_object(vm_connection, "treeview-selection")); + gtk_tree_view_set_model(treeview, model); + + g_signal_connect(treeview, "row-activated", + G_CALLBACK(treeview_row_activated_cb), button_connect); + g_signal_connect(selection, "changed", + G_CALLBACK(treeselection_changed_cb), button_connect); + + gtk_widget_show_all(dialog); + dialog_response = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_hide(dialog); + + if (dialog_response == GTK_RESPONSE_ACCEPT && + gtk_tree_selection_get_selected(selection, &model, &iter)) { + gtk_tree_model_get(model, &iter, 0, &vm_name, -1); + } else { + g_set_error_literal(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED, + _("No virtual machine was chosen")); + } + + gtk_widget_destroy(dialog); + g_object_unref(G_OBJECT(vm_connection)); + + return vm_name; +} + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/src/virt-viewer-vm-connection.h b/src/virt-viewer-vm-connection.h new file mode 100644 index 0000000..8ce0bb2 --- /dev/null +++ b/src/virt-viewer-vm-connection.h @@ -0,0 +1,38 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2014 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef VIRT_VIEWER_VM_CONNECTION_H +#define VIRT_VIEWER_VM_CONNECTION_H + +#include +#include + +gchar* virt_viewer_vm_connection_choose_name_dialog(GtkWindow *main_window, + GtkTreeModel *model, + GError **error); + +#endif +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/src/virt-viewer-vm-connection.xml b/src/virt-viewer-vm-connection.xml new file mode 100644 index 0000000..62319b6 --- /dev/null +++ b/src/virt-viewer-vm-connection.xml @@ -0,0 +1,117 @@ + + + + + False + 5 + Choose a virtual machine + True + center-on-parent + 200 + True + dialog + + + False + vertical + 6 + + + False + end + + + gtk-cancel + True + True + True + True + + + False + True + 0 + + + + + gtk-connect + True + True + True + True + True + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + True + False + 0 + horizontal + + + + + + Name + + + + 0 + + + + + + + True + True + end + 1 + + + + + True + False + 0 + 0 + 4 + Available virtual machines + end + 26 + + + + + + False + True + end + 2 + + + + + + button-cancel + button-connect + + + diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c index fadf0bb..a1b9940 100644 --- a/src/virt-viewer-window.c +++ b/src/virt-viewer-window.c @@ -34,9 +34,11 @@ #include #include #include +#include #include "virt-gtk-compat.h" #include "virt-viewer-window.h" +#include "virt-viewer-display.h" #include "virt-viewer-session.h" #include "virt-viewer-app.h" #include "virt-viewer-util.h" @@ -48,7 +50,9 @@ void virt_viewer_window_menu_view_zoom_reset(GtkWidget *menu, VirtViewerWindow *self); gboolean virt_viewer_window_delete(GtkWidget *src, void *dummy, VirtViewerWindow *self); void virt_viewer_window_menu_file_quit(GtkWidget *src, VirtViewerWindow *self); +void virt_viewer_window_guest_details_response(GtkDialog *dialog, gint response_id, gpointer user_data); void virt_viewer_window_menu_help_about(GtkWidget *menu, VirtViewerWindow *self); +void virt_viewer_window_menu_help_guest_details(GtkWidget *menu, VirtViewerWindow *self); void virt_viewer_window_menu_view_fullscreen(GtkWidget *menu, VirtViewerWindow *self); void virt_viewer_window_menu_send(GtkWidget *menu, VirtViewerWindow *self); void virt_viewer_window_menu_file_screenshot(GtkWidget *menu, VirtViewerWindow *self); @@ -56,13 +60,17 @@ void virt_viewer_window_menu_file_smartcard_insert(GtkWidget *menu, VirtViewerWindow *self); void virt_viewer_window_menu_file_smartcard_remove(GtkWidget *menu, VirtViewerWindow *self); void virt_viewer_window_menu_view_release_cursor(GtkWidget *menu, VirtViewerWindow *self); +void virt_viewer_window_menu_preferences_cb(GtkWidget *menu, VirtViewerWindow *self); + /* Internal methods */ static void virt_viewer_window_enable_modifiers(VirtViewerWindow *self); static void virt_viewer_window_disable_modifiers(VirtViewerWindow *self); -static void virt_viewer_window_resize(VirtViewerWindow *self, gboolean keep_win_size); +static void virt_viewer_window_queue_resize(VirtViewerWindow *self); static void virt_viewer_window_toolbar_setup(VirtViewerWindow *self); static GtkMenu* virt_viewer_window_get_keycombo_menu(VirtViewerWindow *self); +static void virt_viewer_window_get_minimal_dimensions(VirtViewerWindow *self, guint *width, guint *height); +static gint virt_viewer_window_get_minimal_zoom_level(VirtViewerWindow *self); G_DEFINE_TYPE (VirtViewerWindow, virt_viewer_window, G_TYPE_OBJECT) @@ -102,6 +110,7 @@ gint zoomlevel; gboolean fullscreen; gchar *subtitle; + gboolean initial_zoom_set; }; static void @@ -162,8 +171,6 @@ VirtViewerWindowPrivate *priv = VIRT_VIEWER_WINDOW(object)->priv; GSList *it; - G_OBJECT_CLASS (virt_viewer_window_parent_class)->dispose (object); - if (priv->display) { g_object_unref(priv->display); priv->display = NULL; @@ -191,6 +198,8 @@ g_value_unset(&priv->accel_setting); g_clear_object(&priv->toolbar); + + G_OBJECT_CLASS (virt_viewer_window_parent_class)->dispose (object); } static void @@ -204,7 +213,7 @@ menu = GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-send")); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), GTK_WIDGET(virt_viewer_window_get_keycombo_menu(self))); - gtk_widget_set_sensitive(menu, FALSE); + gtk_widget_set_sensitive(menu, (self->priv->display != NULL)); } static void @@ -298,7 +307,9 @@ priv->builder = virt_viewer_util_load_ui("virt-viewer.xml"); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-send")), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-view-zoom")), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-file-screenshot")), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-preferences")), FALSE); gtk_builder_connect_signals(priv->builder, self); @@ -343,7 +354,7 @@ g_object_ref(G_OBJECT(accels->data)); } - priv->zoomlevel = 100; + priv->zoomlevel = NORMAL_ZOOM_LEVEL; } static void @@ -354,29 +365,42 @@ self->priv->desktop_resize_pending = TRUE; return; } - virt_viewer_window_resize(self, FALSE); -} - + virt_viewer_window_queue_resize(self); +} + +static gint +virt_viewer_window_get_real_zoom_level(VirtViewerWindow *self) +{ + GtkAllocation allocation; + guint width, height; + + gtk_widget_get_allocation(GTK_WIDGET(self->priv->display), &allocation); + virt_viewer_display_get_desktop_size(self->priv->display, &width, &height); + + return round((double) NORMAL_ZOOM_LEVEL * allocation.width / width); +} G_MODULE_EXPORT void virt_viewer_window_menu_view_zoom_out(GtkWidget *menu G_GNUC_UNUSED, VirtViewerWindow *self) { - virt_viewer_window_set_zoom_level(self, self->priv->zoomlevel - 10); + virt_viewer_window_set_zoom_level(self, + virt_viewer_window_get_real_zoom_level(self) - ZOOM_STEP); } G_MODULE_EXPORT void virt_viewer_window_menu_view_zoom_in(GtkWidget *menu G_GNUC_UNUSED, VirtViewerWindow *self) { - virt_viewer_window_set_zoom_level(self, self->priv->zoomlevel + 10); + virt_viewer_window_set_zoom_level(self, + virt_viewer_window_get_real_zoom_level(self) + ZOOM_STEP); } G_MODULE_EXPORT void virt_viewer_window_menu_view_zoom_reset(GtkWidget *menu G_GNUC_UNUSED, VirtViewerWindow *self) { - virt_viewer_window_set_zoom_level(self, 100); + virt_viewer_window_set_zoom_level(self, NORMAL_ZOOM_LEVEL); } /* Kick GtkWindow to tell it to adjust to our new widget sizes */ @@ -393,80 +417,6 @@ #else gtk_window_resize(GTK_WINDOW(priv->window), 1, 1); #endif -} - -/* - * This code attempts to resize the top level window to be large enough - * to contain the entire display desktop at 1:1 ratio. If the local desktop - * isn't large enough that it goes as large as possible and lets the display - * scale down to fit, maintaining aspect ratio - */ -static void -virt_viewer_window_resize(VirtViewerWindow *self, gboolean keep_win_size) -{ - GdkRectangle fullscreen; - GdkScreen *screen; - int width, height; - double desktopAspect; - double screenAspect; - guint desktopWidth, display_width; - guint desktopHeight, display_height; - VirtViewerWindowPrivate *priv = self->priv; - - if (priv->fullscreen) - return; - - g_debug("Preparing main window resize"); - if (!priv->display) { - g_debug("Skipping inactive resize"); - return; - } - - virt_viewer_display_get_desktop_size(VIRT_VIEWER_DISPLAY(priv->display), - &desktopWidth, &desktopHeight); - - screen = gtk_widget_get_screen(priv->window); - gdk_screen_get_monitor_geometry(screen, - gdk_screen_get_monitor_at_window - (screen, gtk_widget_get_window(priv->window)), - &fullscreen); - - g_return_if_fail(desktopWidth > 0); - g_return_if_fail(desktopHeight > 0); - - desktopAspect = (double)desktopWidth / (double)desktopHeight; - screenAspect = (double)fullscreen.width / (double)fullscreen.height; - - display_width = desktopWidth * priv->zoomlevel / 100.0; - display_height = desktopHeight * priv->zoomlevel / 100.0; - - if ((display_width > fullscreen.width) || - (display_height > fullscreen.height)) { - /* Doesn't fit native res, so go as large as possible - maintaining aspect ratio */ - if (screenAspect > desktopAspect) { - width = fullscreen.height * desktopAspect; - height = fullscreen.height; - } else { - width = fullscreen.width; - height = fullscreen.width / desktopAspect; - } - width *= 100.0 / priv->zoomlevel; - height *= 100.0 / priv->zoomlevel; - } else { - width = desktopWidth; - height = desktopHeight; - } - - g_debug("Decided todo %dx%d (desktop is %dx%d, fullscreen is %dx%d", - width, height, desktopWidth, desktopHeight, - fullscreen.width, fullscreen.height); - - virt_viewer_display_set_desktop_size(VIRT_VIEWER_DISPLAY(priv->display), - width, height); - - if (!keep_win_size) - virt_viewer_window_queue_resize(self); } static void @@ -828,15 +778,26 @@ static void +virt_viewer_window_set_fullscreen(VirtViewerWindow *self, + gboolean fullscreen) +{ + if (fullscreen) { + virt_viewer_window_enter_fullscreen(self, -1); + } else { + /* leave all windows fullscreen state */ + if (virt_viewer_app_get_fullscreen(self->priv->app)) + g_object_set(self->priv->app, "fullscreen", FALSE, NULL); + /* or just this window */ + else + virt_viewer_window_leave_fullscreen(self); + } +} + +static void virt_viewer_window_toolbar_leave_fullscreen(GtkWidget *button G_GNUC_UNUSED, VirtViewerWindow *self) { - /* leave all windows fullscreen state */ - if (virt_viewer_app_get_fullscreen(self->priv->app)) - g_object_set(self->priv->app, "fullscreen", FALSE, NULL); - /* or just this window */ - else - virt_viewer_window_leave_fullscreen(self); + virt_viewer_window_set_fullscreen(self, FALSE); } static void keycombo_menu_location(GtkMenu *menu G_GNUC_UNUSED, gint *x, gint *y, @@ -873,10 +834,7 @@ { gboolean fullscreen = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu)); - if (fullscreen) - virt_viewer_window_enter_fullscreen(self, -1); - else - virt_viewer_window_leave_fullscreen(self); + virt_viewer_window_set_fullscreen(self, fullscreen); } static void add_if_writable (GdkPixbufFormat *data, GHashTable *formats) @@ -1008,11 +966,64 @@ } G_MODULE_EXPORT void +virt_viewer_window_menu_preferences_cb(GtkWidget *menu G_GNUC_UNUSED, + VirtViewerWindow *self) +{ + virt_viewer_app_show_preferences(self->priv->app, GTK_WIDGET(self->priv->window)); +} + +G_MODULE_EXPORT void virt_viewer_window_menu_view_release_cursor(GtkWidget *menu G_GNUC_UNUSED, VirtViewerWindow *self) { g_return_if_fail(self->priv->display != NULL); virt_viewer_display_release_cursor(VIRT_VIEWER_DISPLAY(self->priv->display)); +} + +G_MODULE_EXPORT void +virt_viewer_window_menu_help_guest_details(GtkWidget *menu G_GNUC_UNUSED, + VirtViewerWindow *self) +{ + GtkBuilder *ui = virt_viewer_util_load_ui("virt-viewer-guest-details.xml"); + char *name = NULL; + char *uuid = NULL; + + g_return_if_fail(ui != NULL); + + GtkWidget *dialog = GTK_WIDGET(gtk_builder_get_object(ui, "guestdetailsdialog")); + GtkWidget *namelabel = GTK_WIDGET(gtk_builder_get_object(ui, "namevaluelabel")); + GtkWidget *guidlabel = GTK_WIDGET(gtk_builder_get_object(ui, "guidvaluelabel")); + + g_return_if_fail(dialog && namelabel && guidlabel); + + g_object_get(self->priv->app, "guest-name", &name, "uuid", &uuid, NULL); + + if (!name || *name == '\0') + name = g_strdup(_("Unknown")); + if (!uuid || *uuid == '\0') + uuid = g_strdup(_("Unknown")); + gtk_label_set_text(GTK_LABEL(namelabel), name); + gtk_label_set_text(GTK_LABEL(guidlabel), uuid); + g_free(name); + g_free(uuid); + + gtk_window_set_transient_for(GTK_WINDOW(dialog), + GTK_WINDOW(self->priv->window)); + + gtk_builder_connect_signals(ui, self); + + gtk_widget_show_all(dialog); + + g_object_unref(G_OBJECT(ui)); +} + +G_MODULE_EXPORT void +virt_viewer_window_guest_details_response(GtkDialog *dialog, + gint response_id, + gpointer user_data G_GNUC_UNUSED) +{ + if (response_id == GTK_RESPONSE_CLOSE) + gtk_widget_hide(GTK_WIDGET(dialog)); } G_MODULE_EXPORT void @@ -1188,6 +1199,19 @@ } void +virt_viewer_window_set_menu_displays_sensitive(VirtViewerWindow *self, gboolean sensitive) +{ + VirtViewerWindowPrivate *priv; + GtkWidget *menu; + + g_return_if_fail(VIRT_VIEWER_IS_WINDOW(self)); + + priv = self->priv; + menu = GTK_WIDGET(gtk_builder_get_object(priv->builder, "menu-displays")); + gtk_widget_set_sensitive(menu, sensitive); +} + +void virt_viewer_window_set_usb_options_sensitive(VirtViewerWindow *self, gboolean sensitive) { VirtViewerWindowPrivate *priv; @@ -1201,6 +1225,29 @@ gtk_widget_set_visible(priv->toolbar_usb_device_selection, sensitive); } +void +virt_viewer_window_set_menus_sensitive(VirtViewerWindow *self, gboolean sensitive) +{ + VirtViewerWindowPrivate *priv; + GtkWidget *menu; + + g_return_if_fail(VIRT_VIEWER_IS_WINDOW(self)); + + priv = self->priv; + + menu = GTK_WIDGET(gtk_builder_get_object(priv->builder, "menu-preferences")); + gtk_widget_set_sensitive(menu, sensitive); + + menu = GTK_WIDGET(gtk_builder_get_object(priv->builder, "menu-file-screenshot")); + gtk_widget_set_sensitive(menu, sensitive); + + menu = GTK_WIDGET(gtk_builder_get_object(priv->builder, "menu-view-zoom")); + gtk_widget_set_sensitive(menu, sensitive); + + menu = GTK_WIDGET(gtk_builder_get_object(priv->builder, "menu-send")); + gtk_widget_set_sensitive(menu, sensitive); +} + static void display_show_hint(VirtViewerDisplay *display, GParamSpec *pspec G_GNUC_UNUSED, @@ -1212,9 +1259,12 @@ hint = (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_READY); - gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-send")), hint); + if (!self->priv->initial_zoom_set && hint && virt_viewer_display_get_enabled(display)) { + self->priv->initial_zoom_set = TRUE; + virt_viewer_window_set_zoom_level(self, self->priv->zoomlevel); + } + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-file-screenshot")), hint); - gtk_widget_set_sensitive(self->priv->toolbar_send_key, hint); } static gboolean window_key_pressed (GtkWidget *widget G_GNUC_UNUSED, @@ -1243,7 +1293,6 @@ if (display != NULL) { priv->display = g_object_ref(display); - virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel); virt_viewer_display_set_monitor(VIRT_VIEWER_DISPLAY(priv->display), priv->fullscreen_monitor); virt_viewer_display_set_fullscreen(VIRT_VIEWER_DISPLAY(priv->display), priv->fullscreen); @@ -1271,6 +1320,16 @@ G_CALLBACK(virt_viewer_window_desktop_resize), self, 0); virt_viewer_signal_connect_object(display, "notify::show-hint", G_CALLBACK(display_show_hint), self, 0); + + display_show_hint(display, NULL, self); + + if (virt_viewer_display_get_enabled(display)) + virt_viewer_window_desktop_resize(display, self); + + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-preferences")), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-view-zoom")), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-send")), TRUE); + gtk_widget_set_sensitive(self->priv->toolbar_send_key, TRUE); } } @@ -1294,15 +1353,15 @@ void virt_viewer_window_show(VirtViewerWindow *self) { - if (self->priv->display) - virt_viewer_display_set_enabled(self->priv->display, TRUE); + if (self->priv->display && !virt_viewer_display_get_enabled(self->priv->display)) + virt_viewer_display_enable(self->priv->display); + + if (self->priv->desktop_resize_pending) { + virt_viewer_window_queue_resize(self); + self->priv->desktop_resize_pending = FALSE; + } gtk_widget_show(self->priv->window); - - if (self->priv->desktop_resize_pending) { - virt_viewer_window_resize(self, FALSE); - self->priv->desktop_resize_pending = FALSE; - } if (self->priv->kiosk) virt_viewer_window_enable_kiosk(self); @@ -1323,7 +1382,7 @@ if (self->priv->display) { VirtViewerDisplay *display = self->priv->display; - virt_viewer_display_set_enabled(display, FALSE); + virt_viewer_display_disable(display); } } @@ -1331,19 +1390,32 @@ virt_viewer_window_set_zoom_level(VirtViewerWindow *self, gint zoom_level) { VirtViewerWindowPrivate *priv; + gint min_zoom; g_return_if_fail(VIRT_VIEWER_IS_WINDOW(self)); priv = self->priv; - if (zoom_level < 10) - zoom_level = 10; - if (zoom_level > 400) - zoom_level = 400; + if (zoom_level < MIN_ZOOM_LEVEL) + zoom_level = MIN_ZOOM_LEVEL; + if (zoom_level > MAX_ZOOM_LEVEL) + zoom_level = MAX_ZOOM_LEVEL; priv->zoomlevel = zoom_level; if (!priv->display) return; + min_zoom = virt_viewer_window_get_minimal_zoom_level(self); + if (min_zoom > priv->zoomlevel) { + g_debug("Cannot set zoom level %d, using %d", priv->zoomlevel, min_zoom); + priv->zoomlevel = min_zoom; + } + + if (priv->zoomlevel == virt_viewer_display_get_zoom_level(priv->display) && + priv->zoomlevel == virt_viewer_window_get_real_zoom_level(self)) { + g_debug("Zoom level not changed, using: %d", priv->zoomlevel); + return; + } + virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel); virt_viewer_window_queue_resize(self); @@ -1351,7 +1423,7 @@ gint virt_viewer_window_get_zoom_level(VirtViewerWindow *self) { - g_return_val_if_fail(VIRT_VIEWER_IS_WINDOW(self), 100); + g_return_val_if_fail(VIRT_VIEWER_IS_WINDOW(self), NORMAL_ZOOM_LEVEL); return self->priv->zoomlevel; } @@ -1374,7 +1446,7 @@ VirtViewerDisplay* virt_viewer_window_get_display(VirtViewerWindow *self) { - g_return_val_if_fail(VIRT_VIEWER_WINDOW(self), FALSE); + g_return_val_if_fail(VIRT_VIEWER_WINDOW(self), NULL); return self->priv->display; } @@ -1394,6 +1466,60 @@ virt_viewer_window_enable_kiosk(self); else g_debug("disabling kiosk not implemented yet"); +} + +static void +virt_viewer_window_get_minimal_dimensions(VirtViewerWindow *self, + guint *width, + guint *height) +{ + GtkRequisition req; + GtkWidget *top_menu; + + top_menu = GTK_WIDGET(gtk_builder_get_object(virt_viewer_window_get_builder(self), "top-menu")); +#if !GTK_CHECK_VERSION(3, 0, 0) + gtk_widget_get_child_requisition(top_menu, &req); +#else + gtk_widget_get_preferred_size(top_menu, &req, NULL); +#endif + /* minimal dimensions of the window are the maximum of dimensions of the top-menu + * and minimal dimension of the display + */ + *height = MIN_DISPLAY_HEIGHT; + *width = MAX(MIN_DISPLAY_WIDTH, req.width); +} + +/** + * virt_viewer_window_get_minimal_zoom_level: + * @self: a #VirtViewerWindow + * + * Calculates the zoom level with respect to the desktop dimensions + * + * Returns: minimal possible zoom level (multiple of ZOOM_STEP) + */ +static gint +virt_viewer_window_get_minimal_zoom_level(VirtViewerWindow *self) +{ + guint min_width, min_height; + guint width, height; /* desktop dimensions */ + gint zoom; + double width_ratio, height_ratio; + + g_return_val_if_fail(VIRT_VIEWER_IS_WINDOW(self) && + self->priv->display != NULL, MIN_ZOOM_LEVEL); + + virt_viewer_window_get_minimal_dimensions(self, &min_width, &min_height); + virt_viewer_display_get_desktop_size(virt_viewer_window_get_display(self), &width, &height); + + /* e.g. minimal width = 200, desktop width = 550 => width ratio = 0.36 + * which means that the minimal zoom level is 40 (4 * ZOOM_STEP) + */ + width_ratio = (double) min_width / width; + height_ratio = (double) min_height / height; + zoom = ceil(10 * MAX(width_ratio, height_ratio)); + + /* make sure that the returned zoom level is in the range from MIN_ZOOM_LEVEL to NORMAL_ZOOM_LEVEL */ + return CLAMP(zoom * ZOOM_STEP, MIN_ZOOM_LEVEL, NORMAL_ZOOM_LEVEL); } /* diff --git a/src/virt-viewer-window.h b/src/virt-viewer-window.h index 4639708..c25e9c9 100644 --- a/src/virt-viewer-window.h +++ b/src/virt-viewer-window.h @@ -32,6 +32,8 @@ #define MIN_ZOOM_LEVEL 10 #define MAX_ZOOM_LEVEL 400 +#define NORMAL_ZOOM_LEVEL 100 +#define ZOOM_STEP 10 #define VIRT_VIEWER_TYPE_WINDOW virt_viewer_window_get_type() @@ -67,7 +69,9 @@ VirtViewerNotebook* virt_viewer_window_get_notebook (VirtViewerWindow* window); void virt_viewer_window_set_display(VirtViewerWindow *self, VirtViewerDisplay *display); VirtViewerDisplay* virt_viewer_window_get_display(VirtViewerWindow *self); +void virt_viewer_window_set_menu_displays_sensitive(VirtViewerWindow *self, gboolean sensitive); void virt_viewer_window_set_usb_options_sensitive(VirtViewerWindow *self, gboolean sensitive); +void virt_viewer_window_set_menus_sensitive(VirtViewerWindow *self, gboolean sensitive); void virt_viewer_window_update_title(VirtViewerWindow *self); void virt_viewer_window_show(VirtViewerWindow *self); void virt_viewer_window_hide(VirtViewerWindow *self); diff --git a/src/virt-viewer.c b/src/virt-viewer.c index 8a1d8c5..10f624d 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -47,6 +47,7 @@ #include "virt-viewer.h" #include "virt-viewer-app.h" #include "virt-viewer-events.h" +#include "virt-viewer-vm-connection.h" #include "virt-viewer-auth.h" struct _VirtViewerPrivate { @@ -54,9 +55,11 @@ virConnectPtr conn; virDomainPtr dom; char *domkey; - gboolean withEvents; gboolean waitvm; gboolean reconnect; + gboolean auth_cancelled; + gint domain_event; + guint reconnect_poll; /* source id */ }; G_DEFINE_TYPE (VirtViewer, virt_viewer, VIRT_VIEWER_TYPE_APP) @@ -66,28 +69,9 @@ static gboolean virt_viewer_initial_connect(VirtViewerApp *self, GError **error); static gboolean virt_viewer_open_connection(VirtViewerApp *self, int *fd); static void virt_viewer_deactivated(VirtViewerApp *self, gboolean connect_error); -static gboolean virt_viewer_start(VirtViewerApp *self); +static gboolean virt_viewer_start(VirtViewerApp *self, GError **error); static void virt_viewer_dispose (GObject *object); - -static void -virt_viewer_get_property (GObject *object, guint property_id, - GValue *value G_GNUC_UNUSED, GParamSpec *pspec) -{ - switch (property_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -virt_viewer_set_property (GObject *object, guint property_id, - const GValue *value G_GNUC_UNUSED, GParamSpec *pspec) -{ - switch (property_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} +static int virt_viewer_connect(VirtViewerApp *app, GError **error); static void virt_viewer_class_init (VirtViewerClass *klass) @@ -97,8 +81,6 @@ g_type_class_add_private (klass, sizeof (VirtViewerPrivate)); - object_class->get_property = virt_viewer_get_property; - object_class->set_property = virt_viewer_set_property; object_class->dispose = virt_viewer_dispose; app_class->initial_connect = virt_viewer_initial_connect; @@ -111,6 +93,54 @@ virt_viewer_init(VirtViewer *self) { self->priv = GET_PRIVATE(self); + self->priv->domain_event = -1; +} + +static gboolean +virt_viewer_connect_timer(void *opaque) +{ + VirtViewer *self = VIRT_VIEWER(opaque); + VirtViewerApp *app = VIRT_VIEWER_APP(self); + + g_debug("Connect timer fired"); + + if (!virt_viewer_app_is_active(app) && + !virt_viewer_app_initial_connect(app, NULL)) + gtk_main_quit(); + + if (virt_viewer_app_is_active(app)) { + self->priv->reconnect_poll = 0; + return FALSE; + } + + return TRUE; +} + +static void +virt_viewer_start_reconnect_poll(VirtViewer *self) +{ + VirtViewerPrivate *priv = self->priv; + + g_debug("reconnect_poll: %d", priv->reconnect_poll); + + if (priv->reconnect_poll != 0) + return; + + priv->reconnect_poll = g_timeout_add(500, virt_viewer_connect_timer, self); +} + +static void +virt_viewer_stop_reconnect_poll(VirtViewer *self) +{ + VirtViewerPrivate *priv = self->priv; + + g_debug("reconnect_poll: %d", priv->reconnect_poll); + + if (priv->reconnect_poll == 0) + return; + + g_source_remove(priv->reconnect_poll); + priv->reconnect_poll = 0; } static void @@ -124,14 +154,15 @@ priv->dom = NULL; } - if (priv->reconnect) { - if (!priv->withEvents) { + if (priv->reconnect && !virt_viewer_app_get_session_cancelled(app)) { + if (priv->domain_event < 0) { g_debug("No domain events, falling back to polling"); - virt_viewer_app_start_reconnect_poll(app); + virt_viewer_start_reconnect_poll(self); } virt_viewer_app_show_status(app, _("Waiting for guest domain to re-start")); virt_viewer_app_trace(app, "Guest %s display has disconnected, waiting to reconnect", priv->domkey); + virt_viewer_app_set_menus_sensitive(app, FALSE); } else { VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->deactivated(app, connect_error); } @@ -185,10 +216,15 @@ { char *end; VirtViewerPrivate *priv = self->priv; - int id = strtol(priv->domkey, &end, 10); + int id; virDomainPtr dom = NULL; unsigned char uuid[16]; + if (priv->domkey == NULL) { + return NULL; + } + + id = strtol(priv->domkey, &end, 10); if (id >= 0 && end && !*end) { dom = virDomainLookupByID(priv->conn, id); } @@ -292,9 +328,61 @@ return ret; } + +static gboolean +virt_viewer_is_loopback(const char *host) +{ + GInetAddress *addr = NULL; + gboolean is_loopback = FALSE; + + g_return_val_if_fail(host != NULL, FALSE); + + addr = g_inet_address_new_from_string(host); + if (!addr) /* Parsing error means it was probably a hostname */ + return (strcmp(host, "localhost") == 0); + + is_loopback = g_inet_address_get_is_loopback(addr); + g_object_unref(addr); + + return is_loopback; +} + + +static gboolean +virt_viewer_is_reachable(const gchar *host, + const char *transport, + const char *transport_host, + gboolean direct) +{ + gboolean host_is_loopback; + gboolean transport_is_loopback; + + if (!host) + return FALSE; + + if (!transport) + return TRUE; + + if (strcmp(transport, "ssh") == 0 && !direct) + return TRUE; + + if (strcmp(transport, "unix") == 0) + return TRUE; + + host_is_loopback = virt_viewer_is_loopback(host); + transport_is_loopback = virt_viewer_is_loopback(transport_host); + + if (transport_is_loopback && host_is_loopback) + return TRUE; + else + return !host_is_loopback; +} + + static gboolean virt_viewer_extract_connect_info(VirtViewer *self, - virDomainPtr dom) + virDomainPtr dom, + GError **error) { char *type = NULL; char *xpath = NULL; @@ -311,16 +399,19 @@ gchar *user = NULL; gint port = 0; gchar *uri = NULL; + gboolean direct = virt_viewer_app_get_direct(app); virt_viewer_app_free_connect_info(app); if ((type = virt_viewer_extract_xpath_string(xmldesc, "string(/domain/devices/graphics/@type)")) == NULL) { - virt_viewer_app_simple_message_dialog(app, _("Cannot determine the graphic type for the guest %s"), - priv->domkey); + g_set_error(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Cannot determine the graphic type for the guest %s"), priv->domkey); + goto cleanup; } - if (virt_viewer_app_create_session(app, type) < 0) + if (!virt_viewer_app_create_session(app, type, error)) goto cleanup; xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@port)", type); @@ -337,22 +428,25 @@ ghost = virt_viewer_extract_xpath_string(xmldesc, xpath); } else { xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@socket)", type); - if ((unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath)) == NULL) { - virt_viewer_app_simple_message_dialog(app, _("Cannot determine the graphic address for the guest %s"), - priv->domkey); - goto cleanup; - } - } - - if (ghost && gport) + unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath); + } + + if (ghost && gport) { g_debug("Guest graphics address is %s:%s", ghost, gport); - else if (unixsock) + } else if (unixsock) { g_debug("Guest graphics address is %s", unixsock); + } else { + g_debug("Using direct libvirt connection"); + retval = TRUE; + goto cleanup; + } uri = virConnectGetURI(priv->conn); if (virt_viewer_util_extract_host(uri, NULL, &host, &transport, &user, &port) < 0) { - virt_viewer_app_simple_message_dialog(app, _("Cannot determine the host for the guest %s"), - priv->domkey); + g_set_error(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Cannot determine the host for the guest %s"), priv->domkey); + goto cleanup; } @@ -365,8 +459,7 @@ */ if (virt_viewer_replace_host(ghost)) { gchar *replacement_host = NULL; - if ((g_strcmp0(transport, "ssh") == 0) - && !virt_viewer_app_get_direct(app)) { + if ((g_strcmp0(transport, "ssh") == 0) && !direct) { replacement_host = g_strdup("localhost"); } else { replacement_host = g_strdup(host); @@ -375,6 +468,17 @@ ghost ? ghost : "", replacement_host); g_free(ghost); ghost = replacement_host; + } + + if (!virt_viewer_is_reachable(ghost, transport, host, direct)) { + g_set_error(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Guest '%s' is not reachable"), priv->domkey); + + g_debug("graphics listen '%s' is not reachable from this machine", + ghost ? ghost : ""); + + goto cleanup; } virt_viewer_app_set_connect_info(app, host, ghost, gport, gtlsport,transport, unixsock, user, port, NULL); @@ -397,7 +501,7 @@ } static gboolean -virt_viewer_update_display(VirtViewer *self, virDomainPtr dom) +virt_viewer_update_display(VirtViewer *self, virDomainPtr dom, GError **error) { VirtViewerPrivate *priv = self->priv; VirtViewerApp *app = VIRT_VIEWER_APP(self); @@ -412,33 +516,47 @@ g_object_set(app, "guest-name", virDomainGetName(dom), NULL); - if (!virt_viewer_app_has_session(app)) { - if (!virt_viewer_extract_connect_info(self, dom)) - return FALSE; - } - - return TRUE; + if (virt_viewer_app_has_session(app)) + return TRUE; + + return virt_viewer_extract_connect_info(self, dom, error); } static gboolean virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd) { -#if defined(HAVE_SOCKETPAIR) VirtViewer *viewer = VIRT_VIEWER(self); VirtViewerPrivate *priv = viewer->priv; +#if defined(HAVE_SOCKETPAIR) || defined(HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD) + virErrorPtr err; +#endif +#if defined(HAVE_SOCKETPAIR) int pair[2]; #endif *fd = -1; -#if defined(HAVE_SOCKETPAIR) + if (!priv->dom) return TRUE; +#ifdef HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD + if ((*fd = virDomainOpenGraphicsFD(priv->dom, 0, + VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH)) >= 0) + return TRUE; + + err = virGetLastError(); + if (err && err->code != VIR_ERR_NO_SUPPORT) { + g_debug("Error %s", err->message ? err->message : "Unknown"); + return TRUE; + } +#endif + +#if defined(HAVE_SOCKETPAIR) if (socketpair(PF_UNIX, SOCK_STREAM, 0, pair) < 0) return FALSE; if (virDomainOpenGraphics(priv->dom, 0, pair[0], VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) < 0) { - virErrorPtr err = virGetLastError(); + err = virGetLastError(); g_debug("Error %s", err && err->message ? err->message : "Unknown"); close(pair[0]); close(pair[1]); @@ -472,7 +590,12 @@ break; case VIR_DOMAIN_EVENT_STARTED: - virt_viewer_update_display(self, dom); + virt_viewer_update_display(self, dom, &error); + if (error) { + virt_viewer_app_simple_message_dialog(app, error->message); + g_clear_error(&error); + } + virt_viewer_app_activate(app, &error); if (error) { /* we may want to consolidate error reporting in @@ -492,7 +615,6 @@ void *opaque) { VirtViewer *self = opaque; - VirtViewerApp *app = VIRT_VIEWER_APP(self); VirtViewerPrivate *priv = self->priv; g_debug("Got connection event %d", reason); @@ -500,7 +622,7 @@ virConnectClose(priv->conn); priv->conn = NULL; - virt_viewer_app_start_reconnect_poll(app); + virt_viewer_start_reconnect_poll(self); } static void @@ -509,19 +631,76 @@ VirtViewer *self = VIRT_VIEWER(object); VirtViewerPrivate *priv = self->priv; - if (priv->withEvents) - virConnectDomainEventDeregister(priv->conn, - virt_viewer_domain_event); - virConnectUnregisterCloseCallback(priv->conn, - virt_viewer_conn_event); - if (priv->dom) + if (priv->conn) { + if (priv->domain_event >= 0) { + virConnectDomainEventDeregisterAny(priv->conn, + priv->domain_event); + priv->domain_event = -1; + } + virConnectUnregisterCloseCallback(priv->conn, + virt_viewer_conn_event); + virConnectClose(priv->conn); + priv->conn = NULL; + } + if (priv->dom) { virDomainFree(priv->dom); - if (priv->conn) - virConnectClose(priv->conn); + priv->dom = NULL; + } + g_free(priv->uri); + priv->uri = NULL; + g_free(priv->domkey); + priv->domkey = NULL; G_OBJECT_CLASS(virt_viewer_parent_class)->dispose (object); } -static int virt_viewer_connect(VirtViewerApp *app); +static virDomainPtr +choose_vm(GtkWindow *main_window, + char **vm_name, + virConnectPtr conn, + GError **error) +{ + GtkListStore *model; + GtkTreeIter iter; + virDomainPtr *domains, dom = NULL; + int i, vms_running; + unsigned int flags = VIR_CONNECT_LIST_DOMAINS_RUNNING; + + g_return_val_if_fail(vm_name != NULL, NULL); + free(*vm_name); + + model = gtk_list_store_new(1, G_TYPE_STRING); + + vms_running = virConnectListAllDomains(conn, &domains, flags); + for (i = 0; i < vms_running; i++) { + gtk_list_store_append(model, &iter); + gtk_list_store_set(model, &iter, 0, virDomainGetName(domains[i]), -1); + virDomainFree(domains[i]); + } + free(domains); + + *vm_name = virt_viewer_vm_connection_choose_name_dialog(main_window, + GTK_TREE_MODEL(model), + error); + g_object_unref(G_OBJECT(model)); + if (*vm_name == NULL) + return NULL; + + dom = virDomainLookupByName(conn, *vm_name); + if (dom == NULL) { + virErrorPtr err = virGetLastError(); + g_set_error_literal(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + err && err->message ? err->message : "unknown libvirt error"); + } else if (virDomainGetState(dom, &i, NULL, 0) < 0 || i != VIR_DOMAIN_RUNNING) { + g_set_error(error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Virtual machine %s is not running"), *vm_name); + virDomainFree(dom); + dom = NULL; + } + + return dom; +} static gboolean virt_viewer_initial_connect(VirtViewerApp *app, GError **error) @@ -532,13 +711,14 @@ VirtViewer *self = VIRT_VIEWER(app); VirtViewerPrivate *priv = self->priv; char uuid_string[VIR_UUID_STRING_BUFLEN]; + GError *err = NULL; g_debug("initial connect"); if (!priv->conn && - virt_viewer_connect(app) < 0) { + virt_viewer_connect(app, &err) < 0) { virt_viewer_app_show_status(app, _("Waiting for libvirt to start")); - goto done; + goto wait; } virt_viewer_app_show_status(app, _("Finding guest domain")); @@ -546,50 +726,55 @@ if (!dom) { if (priv->waitvm) { virt_viewer_app_show_status(app, _("Waiting for guest domain to be created")); - virt_viewer_app_trace(app, "Guest %s does not yet exist, waiting for it to be created", - priv->domkey); - goto done; + goto wait; } else { - virt_viewer_app_simple_message_dialog(app, _("Cannot find guest domain %s"), - priv->domkey); - g_debug("Cannot find guest %s", priv->domkey); - goto cleanup; + VirtViewerWindow *main_window = virt_viewer_app_get_main_window(app); + if (priv->domkey != NULL) + g_debug("Cannot find guest %s", priv->domkey); + dom = choose_vm(virt_viewer_window_get_window(main_window), + &priv->domkey, + priv->conn, + &err); + if (dom == NULL) { + goto cleanup; + } } } if (virDomainGetUUIDString(dom, uuid_string) < 0) { g_debug("Couldn't get uuid from libvirt"); } else { - virt_viewer_app_set_uuid_string(app, uuid_string); + g_object_set(app, "uuid", uuid_string, NULL); } virt_viewer_app_show_status(app, _("Checking guest domain status")); if (virDomainGetInfo(dom, &info) < 0) { - g_debug("Cannot get guest state"); + g_set_error_literal(&err, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + _("Cannot get guest state")); + g_debug("%s", err->message); goto cleanup; } if (info.state == VIR_DOMAIN_SHUTOFF) { virt_viewer_app_show_status(app, _("Waiting for guest domain to start")); - } else { - ret = virt_viewer_update_display(self, dom); - if (ret) - ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, error); - if (!ret) { - if (priv->waitvm) { - virt_viewer_app_show_status(app, _("Waiting for guest domain to start server")); - virt_viewer_app_trace(app, "Guest %s has not activated its display yet, waiting for it to start", - priv->domkey); - } else { - g_debug("Failed to activate viewer"); - goto cleanup; - } - } - } - - done: + goto wait; + } + + if (!virt_viewer_update_display(self, dom, &err)) + goto cleanup; + + ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, &err); + if (ret || err) + goto cleanup; + +wait: + virt_viewer_app_trace(app, "Guest %s has not activated its display yet, waiting " + "for it to start", priv->domkey); ret = TRUE; - cleanup: + +cleanup: + if (err != NULL) + g_propagate_error(error, err); if (dom) virDomainFree(dom); return ret; @@ -599,7 +784,7 @@ virt_viewer_error_func (void *data G_GNUC_UNUSED, virErrorPtr error G_GNUC_UNUSED) { - /* nada */ + /* nothing */ } @@ -611,8 +796,9 @@ { char **username = NULL, **password = NULL; VirtViewer *app = cbdata; + VirtViewerPrivate *priv = app->priv; int i; - int ret = -1; + int ret = 0; g_debug("Got libvirt credential request for %d credential(s)", ncred); @@ -634,14 +820,18 @@ if (username || password) { VirtViewerWindow *vwin = virt_viewer_app_get_main_window(VIRT_VIEWER_APP(app)); GtkWindow *win = virt_viewer_window_get_window(vwin); - ret = virt_viewer_auth_collect_credentials(win, - "libvirt", - app->priv->uri, - username, password); - if (ret < 0) + + if (username && (*username == NULL || **username == '\0')) + *username = g_strdup(g_get_user_name()); + + priv->auth_cancelled = !virt_viewer_auth_collect_credentials(win, + "libvirt", + app->priv->uri, + username, password); + if (priv->auth_cancelled) { + ret = -1; goto cleanup; - } else { - ret = 0; + } } for (i = 0 ; i < ncred ; i++) { @@ -663,8 +853,38 @@ return ret; } +static gchar * +virt_viewer_get_error_message_from_vir_error(VirtViewer *self, + virErrorPtr error) +{ + VirtViewerPrivate *priv = self->priv; + const gchar *error_details = NULL; + gchar *detailed_error_message = NULL; + gchar *error_message = g_strdup_printf(_("Unable to connect to libvirt with URI: %s."), + priv->uri ? priv->uri : _("[none]")); + + g_debug("Error: %s", error->message); + + /* For now we are only treating authentication errors. */ + switch (error->code) { + case VIR_ERR_AUTH_FAILED: + error_details = _("Authentication failed."); + break; + default: + break; + } + + if (error_details != NULL) { + detailed_error_message = g_strdup_printf("%s\n%s", error_message, error_details); + g_free(error_message); + return detailed_error_message; + } + + return error_message; +} + static int -virt_viewer_connect(VirtViewerApp *app) +virt_viewer_connect(VirtViewerApp *app, GError **err) { VirtViewer *self = VIRT_VIEWER(app); VirtViewerPrivate *priv = self->priv; @@ -691,30 +911,41 @@ &auth_libvirt, oflags); if (!priv->conn) { - virt_viewer_app_simple_message_dialog(app, _("Unable to connect to libvirt with URI %s"), - priv->uri ? priv->uri : _("[none]")); + if (!priv->auth_cancelled) { + gchar *error_message = virt_viewer_get_error_message_from_vir_error(self, virGetLastError()); + g_set_error_literal(&error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, + error_message); + + g_free(error_message); + } else { + g_set_error_literal(&error, + VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED, + _("Authentication was cancelled")); + } + g_propagate_error(err, error); return -1; } if (!virt_viewer_app_initial_connect(app, &error)) { - if (error) - g_warning("%s", error->message); - g_clear_error(&error); + g_propagate_prefixed_error(err, error, _("Failed to connect: ")); return -1; } - if (virConnectDomainEventRegister(priv->conn, - virt_viewer_domain_event, - self, - NULL) < 0) - priv->withEvents = FALSE; - else - priv->withEvents = TRUE; - - if (!priv->withEvents && + priv->domain_event = virConnectDomainEventRegisterAny(priv->conn, + priv->dom, + VIR_DOMAIN_EVENT_ID_LIFECYCLE, + VIR_DOMAIN_EVENT_CALLBACK(virt_viewer_domain_event), + self, + NULL); + if (priv->domain_event < 0 && !virt_viewer_app_is_active(app)) { g_debug("No domain events, falling back to polling"); - virt_viewer_app_start_reconnect_poll(app); + virt_viewer_start_reconnect_poll(self); + } else { + /* we may be polling if we lost the libvirt connection and are trying + * to reconnect */ + virt_viewer_stop_reconnect_poll(self); } if (virConnectRegisterCloseCallback(priv->conn, @@ -724,20 +955,24 @@ g_debug("Unable to register close callback on libvirt connection"); } + if (virConnectSetKeepAlive(priv->conn, 5, 3) < 0) { + g_debug("Unable to set keep alive"); + } + return 0; } static gboolean -virt_viewer_start(VirtViewerApp *app) +virt_viewer_start(VirtViewerApp *app, GError **error) { virt_viewer_events_register(); virSetErrorFunc(NULL, virt_viewer_error_func); - if (virt_viewer_connect(app) < 0) + if (virt_viewer_connect(app, error) < 0) return FALSE; - return VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->start(app); + return VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->start(app, error); } VirtViewer * diff --git a/src/virt-viewer.rc b/src/virt-viewer.rc index a9d36f1..8a7a8e2 100644 --- a/src/virt-viewer.rc +++ b/src/virt-viewer.rc @@ -9,12 +9,12 @@ BEGIN VALUE "CompanyName", "virt-manager.org" VALUE "FileDescription", "VirtViewer desktop client" - VALUE "FileVersion", "1.0" - VALUE "InternalName", "virt-viewer 1.0" + VALUE "FileVersion", "3.1" + VALUE "InternalName", "virt-viewer 3.1" VALUE "LegalCopyright", "Copyright (C) 2007-2013 Red Hat, Inc." VALUE "OriginalFilename", "virt-viewer.exe" VALUE "ProductName", "VirtViewer" - VALUE "ProductVersion", "1.0" + VALUE "ProductVersion", "3.1" END END diff --git a/src/virt-viewer.xml b/src/virt-viewer.xml index fd8295f..07948bd 100644 --- a/src/virt-viewer.xml +++ b/src/virt-viewer.xml @@ -4,8 +4,8 @@ False - 400 - 400 + 1024 + 768 @@ -69,6 +69,15 @@ + + True + False + Preferences + True + + + + True False @@ -134,7 +143,6 @@ False True True - @@ -147,7 +155,6 @@ False True True - @@ -216,6 +223,16 @@ True False + + + True + False + False + _Guest Details + True + + + gtk-about diff --git a/virt-viewer.spec b/virt-viewer.spec index 2945926..8a3c56b 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -21,7 +21,7 @@ %endif Name: virt-viewer -Version: 1.0 +Version: 3.1 Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System @@ -57,16 +57,16 @@ %endif %if %{with_spice} %if %{with_gtk3} -BuildRequires: spice-gtk3-devel >= 0.22 +BuildRequires: spice-gtk3-devel >= 0.30 %else -BuildRequires: spice-gtk-devel >= 0.22 +BuildRequires: spice-gtk-devel >= 0.30 %endif -BuildRequires: spice-protocol >= 0.10.1 +BuildRequires: spice-protocol >= 0.12.7 %endif BuildRequires: /usr/bin/pod2man BuildRequires: intltool %if %{with_govirt} -BuildRequires: libgovirt-devel >= 0.3.0 +BuildRequires: libgovirt-devel >= 0.3.2 %endif %if 0%{?fedora} >= 20 @@ -121,22 +121,23 @@ %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : %{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \ spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 25 -update-desktop-database -q %{_datadir}/applications -%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null +/usr/bin/update-desktop-database -q %{_datadir}/applications %postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %{_sbindir}/update-alternatives --remove spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer fi -update-desktop-database -q %{_datadir}/applications -%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null +/usr/bin/update-desktop-database -q %{_datadir}/applications %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -148,6 +149,10 @@ %{_datadir}/%{name}/ui/virt-viewer.xml %{_datadir}/%{name}/ui/virt-viewer-auth.xml %{_datadir}/%{name}/ui/virt-viewer-about.xml +%{_datadir}/%{name}/ui/virt-viewer-guest-details.xml +%{_datadir}/%{name}/ui/virt-viewer-vm-connection.xml +%{_datadir}/%{name}/ui/virt-viewer-preferences.xml +%{_datadir}/%{name}/ui/remote-viewer-connect.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/devices/* %{_datadir}/applications/remote-viewer.desktop diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in index b3b6b5e..e79692b 100644 --- a/virt-viewer.spec.in +++ b/virt-viewer.spec.in @@ -121,22 +121,23 @@ %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : %{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \ spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 25 -update-desktop-database -q %{_datadir}/applications -%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null +/usr/bin/update-desktop-database -q %{_datadir}/applications %postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %{_sbindir}/update-alternatives --remove spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer fi -update-desktop-database -q %{_datadir}/applications -%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null +/usr/bin/update-desktop-database -q %{_datadir}/applications %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -148,6 +149,10 @@ %{_datadir}/%{name}/ui/virt-viewer.xml %{_datadir}/%{name}/ui/virt-viewer-auth.xml %{_datadir}/%{name}/ui/virt-viewer-about.xml +%{_datadir}/%{name}/ui/virt-viewer-guest-details.xml +%{_datadir}/%{name}/ui/virt-viewer-vm-connection.xml +%{_datadir}/%{name}/ui/virt-viewer-preferences.xml +%{_datadir}/%{name}/ui/remote-viewer-connect.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/devices/* %{_datadir}/applications/remote-viewer.desktop