diff -Nru xfce4-taskmanager-1.0.0/ChangeLog xfce4-taskmanager-1.0.1/ChangeLog --- xfce4-taskmanager-1.0.0/ChangeLog 2010-06-14 11:02:40.000000000 +0000 +++ xfce4-taskmanager-1.0.1/ChangeLog 2014-01-08 18:42:06.000000000 +0000 @@ -1,2499 +0,0 @@ -2010-06-14 Mike Massonnet - - === Release 1.0.0 === - - -2010-06-13 Mike Massonnet - - Fix SIGBUS on Debian x86_64 (original patch from Jérôme Guelfucci) - - Something strange happened when doing a comparison between a guint type - and sizeof(), turning it back to gint fixes the issue. Fix other - compiler warnings at the same time. - -2010-06-13 Mike Massonnet - - Don't make redundant messages for translators - - -2010-06-13 Mike Massonnet - - Update POTFILES - - -2010-06-13 Mike Massonnet - - Remove the 250ms refresh rate - - At this refresh rate the application occupies too many CPU cycles and - this is totally beside the point. - -2010-06-13 Mike Massonnet - - Always paint the last monitor peak - - Round the minimum history length and always paint the last peak even if - it doesn't fit entirely. This change was needed because visible with - some refresh rates. - -2010-06-13 Mike Massonnet - - Replace progress bars with monitors - - -2010-06-10 Ivica Kolić - - l10n: Updates to Croatian (hr) translation - - New status: 51 messages complete with 0 fuzzies and 7 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-06-10 Mike Massonnet - - Display tree view context menu on Menu key press - - -2010-06-10 Mike Massonnet - - Add right click menu on status icon with a Quit item - - -2010-06-10 Mike Massonnet - - Hide window on window close when the status icon is visible - - -2010-06-10 Ivica Kolić - - l10n: Updates to Croatian (hr) translation - - New status: 51 messages complete with 0 fuzzies and 7 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-06-09 Johannes Lips - - l10n: Updated German (de) translation to 44% - - New status: 26 messages complete with 26 fuzzies and 6 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-06-09 Mike Massonnet - - Fix compiler warnings from Solaris implementation - - -2010-06-08 Mike Massonnet - - [linux] Fix compiler warnings from Linux implementation - - -2010-06-06 Mike Massonnet - - Fix compiler warnings (original patches from Enrico Tröger) - - Add missing include for geteuid() missing declaration - xtm_process_window_show_swap_usage() in process-window. - Fix various compiler warnings from main.c task-manager.c and - app-manager.c. - -2010-06-08 Mike Massonnet - - [linux] Fix 64-bit issue with scanf - - The fix is very trivial, all it takes is initializing values passed to - scanf to zero. In fact format conversions inside scanf/printf may fail - otherwise. - -2010-06-04 Mike Massonnet - - Update README with optional dependency on libwnck - - -2010-06-04 Mike Massonnet - - Display window icons/names - - Add optional link on libwnck (default=yes) and build a new object from - app-manager.c to keep an up to date list of applications with their name - and icon. Use it inside the task manager object to display inside the - tree view. - -2010-06-04 Abel Martín - - l10n: Updated Spanish (Castilian) (es) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-06-03 Mike Massonnet - - Fix g_snprintf call for task name - - Don't pass task name as format, instead call g_snprintf safely with "%s" - and pass the task name as an argument. - -2010-06-03 Nuno Miguel - - l10n: Updated Portuguese (pt) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-06-02 Mike Massonnet - - Update status icon tooltip only if visible - - -2010-06-02 Mike Massonnet - - Update command line when needed - - -2010-06-02 Mike Massonnet - - Sort on first click in descending order - - -2010-06-02 Mike Massonnet - - On window hide do a normal check on the window - - -2010-06-02 Mike Massonnet - - Center dialogs on mouse cursor - - -2010-06-02 Mike Massonnet - - Avoid saving columns positions when closing application - - When the application was closed, the columns-changed signal was - triggered everytime a tree view column was destroyed/removed from the - tree view (think dispose), and this was bad since the columns positions - may have been saved as a succession of zeros. Avoid this. - -2010-06-02 Mike Massonnet - - Plug a dynamic leak - - A leak occured in the timer code, and thus the memory was growing over - time. Cf. src/task-manager.c(model_update_tree_iter), the old_state - variable was not free'd. - - Plugged other static leaks at the same time. - -2010-06-01 Ivica Kolić - - l10n: Updates to Croatian (hr) translation - - New status: 51 messages complete with 0 fuzzies and 7 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-31 Ayhan YALÇINSOY - - l10n: Updated Turkish (tr) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-31 Ivica Kolić - - l10n: Updated Croatian (hr) translation to 87% - - New status: 51 messages complete with 0 fuzzies and 7 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-30 Mike Massonnet - - Set localized name of application - - -2010-05-30 Mike Massonnet - - Replace image against radio menu items in the refresh rate menu - - The stock items right-arrow are not always available (sad truth), - therefore be smart and use a radio menu item that will always be - displayed. - -2010-05-30 Johannes Lips - - l10n: Updated German (de) translation to 44% - - New status: 26 messages complete with 24 fuzzies and 8 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-29 Mike Massonnet - - Fix cformat parameters for status icon - - -2010-05-28 Mike Massonnet - - bump post release - - -2010-05-28 Mike Massonnet - - === Release 0.5.92 (1.0.0 beta3) === - - -2010-05-28 Mike Massonnet - - Replace carriage returns against spaces in commands - - -2010-05-28 Dmitry Nikitin - - l10n: Updated Ukrainian (uk) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-28 Dmitry Nikitin - - l10n: Updated Ukrainian (uk) translation to 86% - - New status: 50 messages complete with 8 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-28 Mike Massonnet - - Show tasks with changed status with a yellow background - - -2010-05-27 Mike Massonnet - - Get the tree view columns reorderable - - The tree view columns can be reordered, the state will be saved in the - configuration and reloaded at next start. - -2010-05-27 Gheyret Kenji - - l10n: Updated Uyghur (ug) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-27 Gheyret Kenji - - l10n: Updated Uyghur (ug) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-27 Mike Massonnet - - Show terminated tasks with a red background - - -2010-05-26 Mike Massonnet - - Show started tasks with a green background - - -2010-05-26 Mike Massonnet - - Make SearchFunc for tree view case insensitive - - -2010-05-26 Mike Massonnet - - Use a personal SearchFunc for the tree view - - Use the function strstr to find matches inside the command line, and not - only starting with. Browsing through matches can be done by typing the - arrows down and up. - -2010-05-26 Mike Massonnet - - Add words about adding support for a new OS - - Add a skel file (task-manager-skel.c) and make it possible in the - build-env to build the task manager with this file (--with-skel). - -2010-05-26 Mike Massonnet - - Update desktop entry file for applications menu - - Parsed with desktop-file-validate and fixed the reported warnings. - -2010-05-25 Harald Servat - - l10n: Updated Catalan (Valencian) (ca) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-25 Mike Massonnet - - Surround the statusbar's hbox area with padding - - -2010-05-25 Mike Massonnet - - Tweak default settings - - Set default refresh rate to 750ms (makes updating snappier), don't show - with full command lines and turn more precision off. - -2010-05-25 Ivica Kolić - - l10n: Initial Croatian (hr) translation - - New status: 41 messages complete with 0 fuzzies and 17 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Mike Massonnet - - Reduce minimum width request of the (temporary) progress bars - - -2010-05-24 Mike Massonnet - - Display only installed programs in the “Execute” menu - - -2010-05-24 Mike Massonnet - - [linux|solaris] Fix regression introduced with the “Refresh rate” option - - The CPU usage computation done for the processes were broken when the - refresh rate was different than a second. The introduced fix is only - necessary for the Linux and OpenSolaris implementations. - -2010-05-24 Sergio Marques - - l10n: Updated Portuguese (pt) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Sergio Marques - - l10n: Updated Portuguese (pt) translation to 87% - - New status: 51 messages complete with 7 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Per Kongstad - - l10n: Updated Danish (da) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Johannes Lips - - l10n: Updated German (de) translation to 44% - - New status: 26 messages complete with 22 fuzzies and 10 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Masato Hashimoto - - l10n: Updated Japanese (ja) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Gabor Kelemen - - l10n: Updated Hungarian (hu) translation to 98% - - New status: 57 messages complete with 0 fuzzies and 1 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Evaggelos Balaskas - - l10n: Updated Greek (el) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Jari Rahkonen - - l10n: Updated Finnish (fi) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Leandro Regueiro - - l10n: Updated Galician (gl) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Leandro Regueiro - - l10n: Updated Galician (gl) translation to 98% - - New status: 57 messages complete with 0 fuzzies and 1 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Besnik Bleta - - l10n: Updated Albanian (sq) translation to 98% - - New status: 57 messages complete with 0 fuzzies and 1 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Bauzhan Muftakhidinov - - l10n: Updated Kazakh (kk) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Og Maciel - - l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Aleksandr Ponomarenko - - l10n: Updated Russian (ru) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Xu Meihong - - l10n: Updated Chinese (China) (zh_CN) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Mike Massonnet - - l10n: Updated French (fr) translation to 100% - - New status: 58 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Mike Massonnet - - l10n: Updated French (fr) translation to 89% - - New status: 52 messages complete with 6 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-24 Mike Massonnet - - Drop foced debug output of initial tasks - - -2010-05-24 Mike Massonnet - - Show tooltip with system information on status icon - - -2010-05-24 Mike Massonnet - - Make status icon optional with the new setting “Show status icon” - - -2010-05-23 Mike Massonnet - - Hide inside the notification area - - -2010-05-23 Mike Massonnet - - Reorder signals on treeview right click - - Show Terminate after Stop and Kill. - -2010-05-23 Mike Massonnet - - Hide Swap usage from statusbar when swap total equals zero - - -2010-05-23 Mike Massonnet - - Display a warning banner when running as root - - -2010-05-23 Mike Massonnet - - Implement option “Full command line” - - -2010-05-23 Mike Massonnet - - Implement option “More precision” - - -2010-05-22 Mike Massonnet - - Implement option “Refresh rate” - - -2010-05-22 Mike Massonnet - - New options “Refresh rate,” “More precision” and “Full command line" - - New options are in the GUI although they don't do anything yet. - -2010-05-22 Mike Massonnet - - Update CAPSED files - - -2010-05-22 Mike Massonnet - - bump post release - - -2010-05-21 Mike Massonnet - - === Release 0.5.91 (1.0.0 beta2) === - - -2010-05-22 Mike Massonnet - - Credit people behind the different OS implementations - - -2010-05-21 Mike Massonnet - - Fix bug retrieving bad PID from treeview - - Use the model_filter to retrieve the correct selected path and therefore - the right PID. - -2010-05-21 Mike Massonnet - - Add header checks in autoconf script - - -2010-05-21 Mike Massonnet - - [linux|freebsd] Fix condition to calculate CPU usage - - -2010-05-21 Mike Massonnet - - Fix compiler warnings from --enable-debug=yes - - Fixed old-style function definitions, dropped unused variables, renamed - signal to xtm_signal (it shadowed a previous global declaration from - signal.h,) dropped the G_UN/LIKELY calls, missing includes and casted - here and there. - - The task-manager-*.c files /would/ have to be individually fixed. - -2010-05-21 Mike Massonnet - - [openbsd] Don't provide memory/swap values in KiB - - -2010-05-21 Mike Massonnet - - Add FreeBSD implementation - - Original code (task list) is from Oliver Lehmann and was licensed under - FreeBSD (BSD 2-clause.) - -2010-05-21 Gheyret Kenji - - l10n: Uyghur Translation - - New status: 6 messages complete with 0 fuzzies and 39 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-21 Robert Hartl - - l10n: Slovak translation - - New status: 40 messages complete with 0 fuzzies and 5 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-20 Gabor Kelemen - - l10n: Updated Hungarian (hu) translation to 97% - - New status: 44 messages complete with 0 fuzzies and 1 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-17 Mike Massonnet - - Display Swap usage in Solaris implementation - - The Swap usage is retrieved through swapctl(). Also on a separate change, read - the CPU time from the nanosecs instead of ticks for increased precision. - -2010-05-16 Mike Massonnet - - Set GTK+ requirement on GtkBuilder file to 2.12 - - -2010-05-16 Mike Massonnet - - Remove FreeBSD from the BSD family - - The task-manager-bsd.c code doesn't build from FreeBSD. After a look - around FreeBSD retrieves system information through libkvm (Kernel Data - Access Library.) Therefore a separate implementation for FreeBSD will be - needed. - -2010-05-16 Mike Massonnet - - Re-add Solaris implementation - - Solaris support is in again however the Swap usage is missing. Older - files from the tree source have been removed. - -2010-05-16 Landry Breuil - - Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-taskmanager - - Conflicts: - src/task-manager-bsd.c - -2010-05-16 Landry Breuil - - Implement pid_is_sleeping() and fix send_signal_to_pid() - - -2010-05-16 Mike Massonnet - - Don't recount CPU count in Linux implementation - - -2010-05-16 Mike Massonnet - - Move POSIX code to task-manager.c - - The functions send_signal_to_pid() and set_priority_to_pid() are using - POSIX functions and “should” be safe in task-manager.c. Still keep the - enumeration as a bridge between virtual values and real values, there is - no benefit removing them (wasting minutes) and it won't make the code - look better (or worse). - - The functions have been removed from the Linux and BSD implementations. - -2010-05-16 Dmitrij Smirnov - - l10n: Updated Russian (ru) translation to 97% - - New status: 44 messages complete with 1 fuzzy and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-15 Gökmen Görgen - - l10n: Updated Turkish (tr) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-15 Johannes Lips - - l10n: Updated German (de) translation to 44% - - New status: 20 messages complete with 20 fuzzies and 5 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-15 Johannes Lips - - l10n: Updated German (de) translation to 44% - - New status: 20 messages complete with 21 fuzzies and 4 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-14 Sergio Marques - - l10n: Updated Portuguese (pt) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-14 Sergio Marques - - l10n: Updated Portuguese (pt) translation to 97% - - New status: 44 messages complete with 1 fuzzy and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-13 Landry Breuil - - Set Task name from p_comm field, and cmdline from KERN_PROC_ARGV - - -2010-05-13 Landry Breuil - - correctly implement set_priority/send_signal_to_pid() - - -2010-05-13 Landry Breuil - - Implement fetching of swap stats - - -2010-05-13 Landry Breuil - - Fix missing includes, remove unused variables - - -2010-05-13 Landry Breuil - - WIP on OpenBSD support - - - update wrt new Task structure - - handle zombie processes - - get full cmdline - rework - -2010-05-12 Leandro Regueiro - - l10n: Updated Galician (gl) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-12 Leandro Regueiro - - l10n: Updated Galician (gl) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-12 Leandro Regueiro - - l10n: Updated Galician (gl) translation to 93% - - New status: 42 messages complete with 0 fuzzies and 3 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-12 Masato Hashimoto - - l10n: Updated Japanese (ja) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-12 Bauzhan Muftakhidinov - - l10n: Updated Kazakh (kk) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Harald Servat - - l10n: Updated Catalan (Valencian) (ca) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Harald Servat - - l10n: Updated Catalan (Valencian) (ca) translation to 97% - - New status: 44 messages complete with 1 fuzzy and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Evaggelos Balaskas - - l10n: Updated Greek (el) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Aleksandr Ponomarenko - - l10n: Updated Russian (ru) translation to 95% - - New status: 43 messages complete with 2 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Aleksandr Ponomarenko - - l10n: Updated Russian (ru) translation to 46% - - New status: 21 messages complete with 6 fuzzies and 18 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Xu Meihong - - l10n: Updated Chinese (China) (zh_CN) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Bauzhan Muftakhidinov - - l10n: Updated Kazakh (kk) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Bauzhan Muftakhidinov - - l10n: Updated Kazakh (kk) translation to 80% - - New status: 36 messages complete with 9 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Mike Massonnet - - l10n: Updated French (fr) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-11 Mike Massonnet - - bump post release - - -2010-05-11 Mike Massonnet - - === Release 0.5.90 (1.0.0 beta1) === - - -2010-05-10 Paul Seyfert - - l10n: Updated German (de) translation to 44% - - New status: 20 messages complete with 13 fuzzies and 12 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-10 Paul Seyfert - - l10n: Updated German (de) translation to 44% - - New status: 20 messages complete with 13 fuzzies and 12 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-10 Per Kongstad - - l10n: Updated Danish (da) translation to 100% - - New status: 45 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-10 Per Kongstad - - l10n: Updated Danish (da) translation to 97% - - New status: 44 messages complete with 1 fuzzy and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-10 Per Kongstad - - l10n: Updated Danish (da) translation to 86% - - New status: 39 messages complete with 5 fuzzies and 1 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-05-10 Mike Massonnet - - Updated desktop file comment - - -2010-05-10 Mike Massonnet - - Update po files - - -2010-05-10 Mike Massonnet - - Prepare build-env for first beta - - -2010-05-10 Mike Massonnet - - Ask for confirmation to terminate/kill a task - - -2010-05-10 Mike Massonnet - - Display memory values < 1 MiB - - Fixed the MB “typo” and show values for memory in KiB or B if needed. - The threshold for displaying KiB (< 4 MiB) or B (< 9 KiB) are based on - impulse. - -2010-05-10 Mike Massonnet - - Filter tree view with show-all-processes - - Switched the get_hostname() get_owner_uid() public in task-manager.c, - the owner uid is needed in the tree view class in order to filter out - user processes from others. - -2010-05-10 Mike Massonnet - - Renamed Show "system" processes to "all" and added a GtkTreeModelFilter - - - I started to rename "Show sytem processes" to "Show all processes" - and included a GtkTreeModelFilter in between the GtkListStore and - GtkTreeView but nooooo... I had to write private code to sort the - columns. In fact the GtkTreeViewColumn class assumes the model to - be sortable but GtkTreeModelFilter is not, although it provides an - accessor function to the underlying model which is. - - And not to mention that understanding GtkTreeViewColumn is a task - on its own! Having the code under the hand is the only exit. - - -2010-05-09 Mike Massonnet - - Implement new function pid_is_sleeping() - - The function pid_is_sleeping() is implement by the different OS - implementations and returns TRUE or FALSE. It is used in the tree view - context menu to show either the signal Stop or Continue. - -2010-05-09 Mike Massonnet - - Context menu for sending signals and setting priorities - - Base signals and priorities are defined inside the task-manager.h file - to be reused as general values inside the interface. The different OS - implementations have to do the conversion from the enumeration to real - values. - -2010-05-08 Mike Massonnet - - Several micro fixes on the Linux implementation - - Fix one segfault where some processes like “ls” live very briefly and - those may be catched up but at the time to read the cmdline the process - tree already disappeared. Also terminate the cmdline with \0. - - I ran the application on my netbook, which doesn't have /proc//comm - files... The code has been updated to read the short command from the - buffer. - -2010-05-08 Mike Massonnet - - Fix for scanf failing at parsing process names with spaces - - The code still uses scanf to parse the stat file, but the process name - is being cleansed so that it never fails. The name is read from the - “comm” file. It is still a truncated version of the name, and will - likely remain for very long like this. There is one solution, but since - the name isn't currently used inside the interface there is no point - wasting time. - -2010-05-07 Mike Massonnet - - Temporary “fix” of a nasty segfault - - On the Linux implementation, when a process name has a space in it the - sscanf function is unable to parse the line properly. This will have to - be changed, but in the meantime ignore such processes and avoid the - segfault, there are going to be Beta releases. - -2010-05-07 Mike Massonnet - - Enhance performance by updating the GtkTreeModel inside the TaskManager - - The code to update the model has been moved inside the XtmTaskManager - class and this in order to enhance performance. In fact all the rows of - the model were udpdated everytime (150~ processes × 9 columns calls on - gtk_list_store_set per seconds) which represented a big CPU hog. Now - that the model is being updated within the same class that pulls the - processes information it is possible to run low check routines and - update only the rows that have updated information. - - Also big surprise, the new tasks weren't added, well they did but not - the right data. The pointer's location was copied instead of the - pointer's content. - -2010-05-05 Mike Massonnet - - Typo, that's why I hate commit and pushing right behind - - -2010-05-05 Mike Massonnet - - Well s/jiffles/jiffies/ - - I was quite sure I had a typo but didn't concider it. - -2010-05-05 Mike Massonnet - - Calculate CPU usage per process in Linux implementation - - Added a utility function that stores old jiffles inside a hash table in - order to be able to provide usage values of system and user time in - percentage. - -2010-05-05 Mike Massonnet - - Show list of tasks - - Provide the list of tasks through a GArray and parse it in main.c to - update the GtkTreeModel. - -2010-05-02 Mike Massonnet - - Add precision to memory/swap and CPU - - Switched all the gushort against gfloat data types for the memory, swap - and CPU usages. Show them with a precision of two decimals in the GUI. - -2010-05-02 Mike Massonnet - - Read information from memory/swap and CPU - - This commit is the second of an incremental serie. There will be other - commits with the information about tasks and the support for BSD and - Solaris once things are settled. - - The TaskManager class is build with a new source task-manager-linux.c - that provides functions specific to the Linux implementation. It has - functions to read the usage of the memory/swap and the CPU. - -2010-04-30 Mike Massonnet - - Initial TaskManager class and make room for Swap - - Added the TaskManager class to hold system information and tasks. - Currently it provides username and hostname based on POSIX functions. - The Swap is now part of the system information and is being displayed in - the statusbar. - -2010-04-29 Mike Massonnet - - Rename “Information” to “Preferences” - - -2010-04-29 Mike Massonnet - - Custom statusbar - - The statusbar is created since a separate widget class and has three - different labels (settable through properties) for CPU, memory and - number of processes. This makes it more convenient to change one or - another value and it gives a nicer look. - -2010-04-28 Mike Massonnet - - Initial commit of new interface - - Changes touching the build: - - Bumped version to 0.5.0. - - Removed dependency on Xfce libs (it only depends on GTK+-2.0.) - - Updated Makefile with new source files. - - Build ChangeLog through a script (remove it from source tree.) - - More generally speaking, the interface is build on top of a GtkBuilder - UI definition, with a personal GtkTreeView and a Settings GObject to - update the information shown on the interface on changes. All the code - is being written with GObjects which will make it a lot easier to - separate GUI code and system code. - -2010-04-06 A S Alam - - l10n: Updated Panjabi (Punjabi) (pa) translation to 100% - - New status: 31 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-04-04 A S Alam - - l10n: Punjabi Translation Added - - New status: 29 messages complete with 0 fuzzies and 2 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-03-28 Fabian Nowak - - l10n: Updated German (de) translation to 100% - - New status: 31 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-03-23 Bauzhan Muftakhidinov - - l10n: Updated Kazakh (kk) translation to 100% - - New status: 31 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-03-16 Bauzhan Muftakhidinov - - l10n: New translation into Kazakh - - New status: 16 messages complete with 0 fuzzies and 15 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-03-13 Akila Wajirasena - - l10n: Updated Sinhala (si) translation to 83% - - New status: 26 messages complete with 5 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-03-13 Akila Wajirasena - - l10n: Updated Sinhala (si) translation to 67% - - New status: 21 messages complete with 3 fuzzies and 7 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-03-13 Danishka Navin - - l10n: Added Sinhala (si) translation - - New status: 4 messages complete with 0 fuzzies and 27 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-03-12 Andres Kovtunos - - l10n: Updated Russian (ru) translation to 100% - - New status: 31 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-02-05 Gabor Kelemen - - l10n: Updated Hungarian (hu) translation to 100% - - New status: 31 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2010-01-14 Timo Verbeek - - l10n: Updated Dutch (Flemish) (nl) translation to 100% - - New status: 31 messages complete with 0 fuzzies and 0 untranslated. - - Transmitted-via: Transifex (translations.xfce.org). - -2009-12-16 Daniel Nylander - - l10n: Updates to Swedish (sv) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-11-21 Cristian Marchi - - l10n: Updates to Italian (it) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-10-17 Vlad Vasilev - - l10n: Updates to Russian (ru) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-10-17 Vlad Vasilev - - l10n: Updates to Russian (ru) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-10-16 Rihards Prieditis - - l10n: Updates to Latvian (lv) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-10-01 Leandro Regueiro - - l10n: Updates to Galician (gl) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-09-11 Mike Massonnet - - Small factorize on cmdline reading - - -2009-09-09 Mike Massonnet - - Show command line arguments in Linux - - -2009-09-08 Mike Massonnet - - Update Solaris patch from Peter Tribble - - Check for the lib kstat in the autoconf script. - Build with the correct file for Solaris in the automake script. - Fixed the xfce_err messages and switched to g_snprintf for the command strings. - Updated the TODO file. - -2009-09-03 Mike Massonnet - - Add support for Solaris from Peter Tribble - - -2009-08-18 Mike Massonnet - - Update autotools build - - Drop the po/LINGUAS file and substitute them directly inside the - configure script instead. - Update the version tag svn=>git and pass the project URL. - Add a module.xml file for cgit. - -2009-08-18 Jeff Bailes - - l10n: Updates to English (United Kingdom) (en_GB) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-08-16 Auke Kok - - l10n: Updates to Dutch (Flemish) (nl) translation - - Transmitted-via: Transifex (translations.xfce.org) - -2009-08-08 Mike Massonnet - - update goodies translation - - (Old svn revision: 7896) - -2009-07-24 Gabor Kelemen - -2009-07-24 Gabor Kelemen - - * hu.po: Translation reworked. - - (Old svn revision: 7815) - -2009-06-28 Mike Massonnet - - update goodies translation - - (Old svn revision: 7639) - -2009-06-09 Mike Massonnet - - Drop svn:executable bit from po files - - (Old svn revision: 7518) - -2009-05-29 Mike Massonnet - - update goodies translations - - (Old svn revision: 7436) - -2009-04-16 Mike Massonnet - - goodies translation update - - (Old svn revision: 7213) - -2009-03-19 Masato Hashimoto - - * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) * ja.po: Japanese translation update (Masato Hashimoto) - - (Old svn revision: 6949) - -2009-03-14 Maximilian Schleiss - - Translations updates - es fr gl it tr - - (Old svn revision: 6902) - -2009-03-08 Piotr Sokól - - Updated Polish translations - - (Old svn revision: 6868) - -2009-03-05 Mike Massonnet - - Fix the renaming of the pt nb files -- thanks to jerome who noticed this problem - - (Old svn revision: 6850) - -2009-03-05 Mike Massonnet - - Renamed pt_PT to pt and nb_NO to nb (bug #4574) - - (Old svn revision: 6848) - -2009-03-01 Maximilian Schleiss - - Translations updates - es pl uk - - (Old svn revision: 6826) - -2009-02-22 Mike Massonnet - - Update translations -- Remove executable property on all po files (only da.po actuall) - - (Old svn revision: 6759) - -2009-02-08 Maximilian Schleiss - - Translations updates - fr id it ja nb pl - - (Old svn revision: 6659) - -2009-02-01 Michal Varady - - Czech translation fixed - - (Old svn revision: 6626) - -2008-12-25 Maximilian Schleiss - - Translations updates - es gl id ja uk - - (Old svn revision: 6367) - -2008-12-20 Alexander Toresson - - xfce4-taskmanager/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-time-out-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-wavelan-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-radio-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-datetime-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-cpufreq-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfburn/trunk/po: * sv.po: Swedish translation update (Daniel Nylander) xfce4-xkb-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-smartbookmark-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-smartpm-plugin/trunk/po: * sv.po: Swedish translation update (Daniel Nylander) thunar-media-tags-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfvnc/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-verve-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-xfapplet-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) thunar-archive-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-websearch-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-screenshooter-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-teatime-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-rss-plugin/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfmpc/trunk/po: * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) - - (Old svn revision: 6343) - -2008-12-13 Maximilian Schleiss - - Translations updates - ja uk zh_CN - - (Old svn revision: 6298) - -2008-12-07 Piarres Beobide - - Goodies Basque translation update - - (Old svn revision: 6292) - -2008-11-17 Eren Turkay - - Add/update Turkish translation files thanks to the Turkish translation team! (Gökmen Görgen, Samed Beyribey, Özgür Kuru, Utku Aydın) - - (Old svn revision: 6129) - -2008-11-16 Maximilian Schleiss - - Translations updates and additions - ca, nb_NO, uk, zh_CN - - (Old svn revision: 6128) - -2008-11-12 Piarres Beobide - - Some goodies Basque translation update - - (Old svn revision: 6068) - -2008-11-09 Maximilian Schleiss - - Translations updates for a lot of languages in a lot of packages - - (Old svn revision: 6041) - -2008-11-08 Alexander Nyakhaychyk - - * Added Belarusian translation - - (Old svn revision: 6024) - -2008-11-08 Alexander Nyakhaychyk - - * Added Belarusian translation - - (Old svn revision: 6023) - -2008-11-02 Maximilian Schleiss - - Translations updates and additions - de ku nl - - (Old svn revision: 5928) - -2008-10-20 Maximilian Schleiss - - Translation udpates for German and Japanese - - (Old svn revision: 5729) - -2008-10-10 Maximilian Schleiss - - Translations updates and added for the sensors, gsynaptics, xfmedia, xfmpc, smartbookmark, timer, xkb and taskmanager plugins - - (Old svn revision: 5552) - -2008-10-02 Lars Nielsen - - * da.po: Danish translation update - - (Old svn revision: 5504) - -2008-09-21 Mike Massonnet - - Fix build for libtool 2.2 (or at least for ArchLinux) - - (Old svn revision: 5430) - -2008-09-15 Mike Massonnet - - prepare 0.4.1 release - - (Old svn revision: 5416) - -2008-09-11 Piarres Beobide - - BAsque translation update - - (Old svn revision: 5394) - -2008-09-11 Jari Rahkonen - - Update Finnish translation - - (Old svn revision: 5390) - -2008-09-08 Maximilian Schleiss - - Translations update for id and fr - - (Old svn revision: 5375) - -2008-09-08 Og Maciel - - Updated European Portuguese translation. - - (Old svn revision: 5373) - -2008-09-01 SZERVÁC Attila - - [intl:hu] little updates - - (Old svn revision: 5334) - -2008-08-25 Michal Varady - - Updated Czech translations - - (Old svn revision: 5300) - -2008-08-09 Stavros Giannouris - - Greek translation update for xfce4-taskmanager - - (Old svn revision: 5213) - -2008-08-03 Mike Massonnet - - Fix int compare function; Drop useless cast which makes the CPU usage per process worky again - - (Old svn revision: 5192) - -2008-08-03 Mike Massonnet - - New function to get the full and short cmdline (Linux) - - (Old svn revision: 5191) - -2008-08-02 Mike Massonnet - - Quick clean up, update TODO, and display memory less than 1 MB - - (Old svn revision: 5187) - -2008-07-31 Maxim Dziumanenko - - Maxim Dziumanenko - - * Updated Ukrainian translation. - - - - (Old svn revision: 5183) - -2008-07-30 Mike Massonnet - - update-credits - - (Old svn revision: 5180) - -2008-07-30 Mike Massonnet - - make update-po - - (Old svn revision: 5179) - -2008-07-30 Mike Massonnet - - Apply patch for BSD support from Landry Breuil - - (Old svn revision: 5178) - -2008-07-26 Og Maciel - - Updated translation message template and catalogs; updated Brazilian Portuguese translations - - (Old svn revision: 5163) - -2008-07-26 Og Maciel - - Updated Brazilian Portuguese translation. - - (Old svn revision: 5160) - -2008-07-16 Mohamed Magdy - - Update Arabic translations - - (Old svn revision: 5118) - -2008-07-15 Mohamed Magdy - - Update Arabic translations - - (Old svn revision: 5093) - -2008-07-14 Maximilian Schleiss - - Translations added and updated for most goodies (gl;pt_PT;zh_CN) - - (Old svn revision: 5072) - -2008-06-26 Maximilian Schleiss - - Translations added and updated for most goodies (gl) - - (Old svn revision: 4998) - -2008-06-25 Maximilian Schleiss - - Translations added for most goodies (id) - - (Old svn revision: 4996) - -2008-05-27 Mike Massonnet - - update-po - - (Old svn revision: 4846) - -2008-05-18 Mike Massonnet - - === Release 0.4.0 ===; update po/ChangeLog - - (Old svn revision: 4825) - -2008-05-18 Mike Massonnet - - Use portable function to get the pagesize; Use a bigger "Information" icon in the menu * src/xfce-taskmanager-linux.c, src/xfce-taskmanager-linux.h, src/interface.c(fill_list_item): - Use portale function to get the pagesize, and fallback to 4K * src/interface.c(create_infomenu): - Use a bigger "Information" icon in the menu - - (Old svn revision: 4824) - -2008-05-17 Michal Varady - - updated Czech translation - - (Old svn revision: 4811) - -2008-05-16 Mike Massonnet - - New information menu to select the columns to display; minor clean up - - (Old svn revision: 4806) - -2008-05-16 Mike Massonnet - - Minor changes: don't focus button on click, right align priority column - - (Old svn revision: 4805) - -2008-05-14 Piarres Beobide - - xfce4-taskmanager basque translation update - - (Old svn revision: 4796) - -2008-05-13 Mike Massonnet - - update en_GB translations - - (Old svn revision: 4794) - -2008-05-12 SZERVÁC Attila - - little Hungarian updates - - (Old svn revision: 4788) - -2008-05-11 Mike Massonnet - - update japanese translation - - (Old svn revision: 4781) - -2008-05-10 Mike Massonnet - - prepare release 0.4.0 - - (Old svn revision: 4778) - -2008-05-10 Mike Massonnet - - Set window icon to "xfce-system" and modify the about dialog - - (Old svn revision: 4777) - -2008-05-10 Mike Massonnet - - Redo what is displayed in More info (PPID, STATE, VM-size), and keep RSS in normal info - - (Old svn revision: 4776) - -2008-05-10 Jari Rahkonen - - Updated Finnish translation - - (Old svn revision: 4775) - -2008-05-10 Mike Massonnet - - update german translation - - (Old svn revision: 4771) - -2008-05-10 Stavros Giannouris - - Greek translation updates by me and Evaggelos Balaskas - - (Old svn revision: 4764) - -2008-05-09 Mike Massonnet - - Set buffer_status to 1024 (fixes issues with 64bit archs); use convenience macro GINT_TO_POINTER to pass to user_data - - (Old svn revision: 4763) - -2008-05-09 Mike Massonnet - - nl.po: fix typo - - (Old svn revision: 4762) - -2008-05-09 Mike Massonnet - - Update Dutch translation - - (Old svn revision: 4761) - -2008-05-09 Og Maciel - - Updated Brazilian Portuguese translation. - - (Old svn revision: 4760) - -2008-05-09 Mike Massonnet - - Properly refresh the CPU usage of a process - - (Old svn revision: 4759) - -2008-05-09 Mike Massonnet - - Update strings and make update-po - - (Old svn revision: 4758) - -2008-05-09 Mike Massonnet - - update changelog - - (Old svn revision: 4757) - -2008-05-09 Mike Massonnet - - Properly display the memory usage and fix signal connected on the show_cached_as_free menu item - - (Old svn revision: 4756) - -2008-05-09 Mike Massonnet - - Save sort column/type in config - - (Old svn revision: 4755) - -2008-05-09 Mike Massonnet - - Add credits and update ChangeLog - - (Old svn revision: 4754) - -2008-05-09 Mike Massonnet - - Set command column expand and ellipsize - - (Old svn revision: 4753) - -2008-05-09 Mike Massonnet - - Switch lines time=$new_time; old_time=time - - (Old svn revision: 4752) - -2008-05-09 Mike Massonnet - - Forgot functions.c to replace task.size against task.vsize - - (Old svn revision: 4751) - -2008-05-09 Mike Massonnet - - Fix the event of the mainmenu to display on keyboard and mouse - - (Old svn revision: 4750) - -2008-05-09 Mike Massonnet - - Properly position the main menu - - (Old svn revision: 4749) - -2008-05-09 Mike Massonnet - - Fix coding style - - (Old svn revision: 4748) - -2008-05-09 Mike Massonnet - - Fix strings - - (Old svn revision: 4747) - -2008-05-09 Mike Massonnet - - Properly save window size on quit - - (Old svn revision: 4746) - -2008-05-09 Mike Massonnet - - Right align numerical columns - - (Old svn revision: 4745) - -2008-05-08 Mike Massonnet - - Correctly display the memory size of the processes - - (Old svn revision: 4744) - -2008-05-05 Og Maciel - - Updated Brazilian Portuguese translation. - - (Old svn revision: 4738) - -2008-05-05 Mike Massonnet - - make update-po - - (Old svn revision: 4732) - -2008-05-05 Mike Massonnet - - Delete automated files - - (Old svn revision: 4731) - -2008-05-05 Mike Massonnet - - Remove useless gettext() and properly align menu items on the right - - (Old svn revision: 4730) - -2008-04-24 Stavros Giannouris - - Added xfce4-taskmanager Greek translation by Evaggelos Balaskas. Added el in LINGUAS for the screenshooter plugin (yes, getting old, I know...) - - (Old svn revision: 4671) - -2008-04-10 Brian Tarricone - - fix make distcheck (for snapshots) - - (Old svn revision: 4532) - -2008-03-18 Mike Massonnet - - Update Portuguese translation - - (Old svn revision: 4067) - -2008-02-29 Johannes Zellner - - - added a simple .desktop file (I don't have a icon for the application :( ) - - (Old svn revision: 4008) - -2008-02-10 Johannes Zellner - - - initial priority setting - few bugfixes - - (Old svn revision: 3940) - -2007-12-19 Maximilian Schleiss - - German translation updates in trunk - - (Old svn revision: 3731) - -2007-11-19 Maximilian Schleiss - - Latvian translations added to most goodies. - - (Old svn revision: 3611) - -2007-11-15 Mike Massonnet - - Fix changelogs for updated ur.po files, and add thunar-archive-plugin - - (Old svn revision: 3591) - -2007-11-15 Mike Massonnet - - Rename pk.po to ur.po - - (Old svn revision: 3590) - -2007-11-03 Maximilian Schleiss - - Italian updates and new translations added to some goodies. - - (Old svn revision: 3500) - -2007-10-28 Mike Massonnet - - Add new translation by محمد علي المكي - - (Old svn revision: 3466) - -2007-10-24 Brian Tarricone - - remove trailing parens on AC_INIT version info to work around bug in intltool 0.35.x and 0.36.x - - (Old svn revision: 3434) - -2007-09-03 Og Maciel - - Updated translations for Brazilian Portuguese by Pablo Galletti Vieira. - - (Old svn revision: 3128) - -2007-07-08 Maximilian Schleiss - - Last bunch of pt_PT and nb_NO files to be added. - - (Old svn revision: 2900) - -2007-07-08 Maximilian Schleiss - - * nb_NO.po: Norwegian Bokmal translations added * pt_PT.po: European Portuguese translations added - - (Old svn revision: 2898) - -2007-06-20 Maximilian Schleiss - - * en_GB.po: British English translation for the mount plugin package updated * pt_PT.po: European Portuguese translation update - - (Old svn revision: 2843) - -2007-04-03 Maximilian Schleiss - - * pl.po: Small fix to the taskmanager Polish translation. - - (Old svn revision: 2658) - -2007-03-31 Pau Rullan Ferragut - - forgot to add in LINGUAS en_GB - - (Old svn revision: 2640) - -2007-03-31 Pau Rullan Ferragut - - i18n british translation - - (Old svn revision: 2612) - -2007-02-02 Maximilian Schleiss - - Added the Albanian translations by Besnik Bleta for all the goodies. - - (Old svn revision: 2480) - -2007-01-20 Nick Schermer - - Fix Id - - (Old svn revision: 2445) - -2007-01-20 Jari Rahkonen - - Updated Finnish translations - - (Old svn revision: 2443) - -2007-01-19 SZERVÁC Attila - - xkb & taskman updated - - (Old svn revision: 2434) - -2007-01-18 Maximilian Schleiss - - Updated the French, German and Polish translations. Added the Polish translation to the thunar-volman package. - - (Old svn revision: 2425) - -2007-01-17 Nick Schermer - - Fix version - - (Old svn revision: 2404) - -2007-01-17 Nick Schermer - - * Bump version for release - - (Old svn revision: 2400) - -2007-01-16 Piarres Beobide - - Basque translation update - - (Old svn revision: 2374) - -2007-01-14 Michal Varady - - Updated Czech translations for cpugraph and taskmanager plugins - - (Old svn revision: 2361) - -2007-01-13 Maximilian Schleiss - - Updated the French translation of the taskmanager plugin package - - (Old svn revision: 2360) - -2007-01-13 Nick Schermer - - Change version number and svn revision support in configure.in.in - - (Old svn revision: 2351) - -2007-01-13 Nick Schermer - - Apply patch from Álvaro Lopes to fix CPU usage per task, with more then 1 CPU. Added a THANKS file. Remove some svn executable properties and add svn keywords. Added LINGUAS support and removed the configure.ac > configure.in.in file. Improved the configure.in.in and Makefiles. - - (Old svn revision: 2350) - -2007-01-12 Nick Schermer - - Apply patch from bug 2714. Fix all typos and compiler warnings. - - (Old svn revision: 2347) - -2007-01-08 Stephan Arts - - initial dutch translation - - (Old svn revision: 2317) - -2006-12-17 SZERVÁC Attila - - little header fixes - - (Old svn revision: 2248) - -2006-11-26 SZERVÁC Attila - - notes, taskman updated - - (Old svn revision: 2182) - -2006-11-11 Maximilian Schleiss - - Updated the German translation for the xfce-taskmanager package by Enrico tröger - - (Old svn revision: 2166) - -2006-10-22 Adriano Winter Bess - - Updated brazilian portuguese translations. - - (Old svn revision: 2120) - -2006-09-18 Pau Rullan Ferragut - - taskmanager, add catalan translation - - (Old svn revision: 2052) - -2006-09-17 Jean-François Wauthy - - Update French and Polish translations - - (Old svn revision: 2039) - -2006-09-17 Jean-François Wauthy - - updated French and Czech translations - - (Old svn revision: 2038) - -2006-09-15 Johannes Zellner - - * applied patch from Enrico Tröger, adding tooltips to the cpu/mem usage-bars - - Thank You ! :-) - - - - (Old svn revision: 2034) - -2006-09-13 Jari Rahkonen - - Updated Finnish translations. - - (Old svn revision: 2030) - -2006-09-12 Piarres Beobide - - Basque translation update - - (Old svn revision: 2026) - -2006-09-12 SZERVÁC Attila - - hu trunk: updates - - (Old svn revision: 2022) - -2006-09-10 Nick Schermer - - * Regenerated all *.po files - - (Old svn revision: 2006) - -2006-09-10 Nick Schermer - - * Created new pot files for all goodies - - (Old svn revision: 2005) - -2006-09-10 Nick Schermer - - Big cleanup of the goodies svn. The following files are removed: .cvsignore Makefile.in aclocal.m4 compile config.guess config.h.in config.sub configure depcomp install-sh intltool-*.in ltcf-c.sh ltmain.sh missing mkinstalldirs Makefile.in.in *.gmo So keep it clean from now on ^_^. - - (Old svn revision: 2002) - -2006-09-06 SZERVÁC Attila - - hu trunk: n-d added, taskman updated - - (Old svn revision: 1987) - -2006-09-06 Hydonsingore Cia - - Updated traditional Chinese translations. - - (Old svn revision: 1981) - -2006-09-03 Johannes Zellner - - * removed a senseless printf :-) - - (Old svn revision: 1957) - -2006-09-02 Johannes Zellner - - * added progessbars for cpu and memory usage - - (Old svn revision: 1935) - -2006-08-27 Jean-François Wauthy - - Add/Update Czech translations - - (Old svn revision: 1927) - -2006-08-23 Johannes Zellner - - * fixed a crash * fixed the vm-display * added a TODO-list - - (Old svn revision: 1919) - -2006-08-23 Johannes Zellner - - * remove old files * remove custom signal entries - - (Old svn revision: 1916) - -2006-08-23 Johannes Zellner - - * some files renamed * few small security changes - - (Old svn revision: 1915) - -2006-08-20 Jean-François Wauthy - - add Galician translations - - (Old svn revision: 1914) - -2006-08-15 Johannes Zellner - - (Old svn revision: 1902) - - -2006-08-15 Johannes Zellner - - (Old svn revision: 1901) - - -2006-08-14 Johannes Zellner - - * added bz2 for 'make dist' - - (Old svn revision: 1899) - -2006-07-28 Hydonsingore Cia - - Add trational Chinese po files from Cosmo Chene - - (Old svn revision: 1813) - -2006-07-09 Johannes Zellner - - - now the linux-parts are running very save - updated the website in the "about"-dialog - - (Old svn revision: 1477) - -2006-07-07 SZERVÁC Attila - - hu: mount, taskman updated, THX 2 kelemeng - - (Old svn revision: 1475) - -2006-06-28 Johannes Zellner - - * new design with processinfo-grabbing * config-file support - - (Old svn revision: 1462) - -2006-05-19 Johannes Zellner - - cleanups - - (Old svn revision: 1418) - -2006-05-08 Johannes Zellner - - - moved some functions to where they belong to - renamed many things. - code-cleanups - - (Old svn revision: 1386) - -2006-04-29 Johannes Zellner - - Now using /proc//stat - - (Old svn revision: 1368) - -2006-04-09 Daichi Kawahata - - Added Russian translations by Andrey Fedoseev . - - (Old svn revision: 1323) - -2006-04-08 Daichi Kawahata - - Added/Updated Polish translations by Piotr Malinski . - - (Old svn revision: 1306) - -2006-04-01 Daichi Kawahata - - Updated. - - (Old svn revision: 1269) - -2006-04-01 Daichi Kawahata - - Added Japanese translations. - - (Old svn revision: 1268) - -2006-04-01 Daichi Kawahata - - Removed auto-generated file. - - (Old svn revision: 1267) - -2006-03-29 Johannes Zellner - - - Fixed bug in functions.c - switched from /proc//status to /proc//stat - removed the SleepAVG column - - (Old svn revision: 1264) - -2006-03-28 Johannes Zellner - - Hey I'm active! :-) This is the initial commit for the 0.4.0 xfce4-taskmanager. - - New Things: - - now you have a configuration-file - - views are saved and restored - - task SleepAverage display - - few bugfixes - - - - (Old svn revision: 1262) - -2006-02-23 Daichi Kawahata - - Added Vietnamese translations by Phan Vinh Thinh . - - (Old svn revision: 1120) - -2006-02-22 Daichi Kawahata - - Updated. - - (Old svn revision: 1107) - -2006-02-18 Daichi Kawahata - - Added `hu' to the XDT_I18N()/BM_I18N(). - - (Old svn revision: 1066) - -2006-02-15 Daichi Kawahata - - Added Basque translations by Piarres Beobide . - - (Old svn revision: 1059) - -2006-02-11 SZERVÁC Attila - - Add Hungarian Translations - - (Old svn revision: 1040) - -2006-01-04 Daichi Kawahata - - Added executable attribute. - - (Old svn revision: 925) - -2006-01-04 Daichi Kawahata - - Updated and fixed i18n stuffs. - - (Old svn revision: 924) - -2006-01-04 Daichi Kawahata - - Removed unnecessary files. - - (Old svn revision: 923) - -2005-11-09 Johannes Zellner - - (Old svn revision: 866) - - -2005-10-09 Johannes Zellner - - add french translation - - (Old svn revision: 828) - -2005-10-09 Johannes Zellner - - replace some old files - - (Old svn revision: 827) - -2005-10-09 Johannes Zellner - - (Old svn revision: 826) - - -2005-09-07 Johannes Zellner - - (Old svn revision: 777) - - -2005-09-07 Johannes Zellner - - (Old svn revision: 776) - - -2005-09-07 Johannes Zellner - - (Old svn revision: 775) - - -2005-02-11 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 535) - -2005-02-01 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 534) - -2005-02-01 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 533) - -2005-02-01 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 532) - -2005-02-01 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 531) - -2005-01-31 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 530) - -2005-01-31 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 529) - -2005-01-31 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 528) - -2005-01-31 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 527) - -2005-01-31 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 526) - -2005-01-26 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 525) - -2005-01-26 Johannes Zellner - - *** empty log message *** - - (Old svn revision: 524) - -2005-01-26 Johannes Zellner - - Initial revision - - (Old svn revision: 520) - -2005-01-26 Unknown Author - - New repository initialized by cvs2svn. - - (Old svn revision: 519) - diff -Nru xfce4-taskmanager-1.0.0/INSTALL xfce4-taskmanager-1.0.1/INSTALL --- xfce4-taskmanager-1.0.0/INSTALL 2010-06-14 11:02:24.000000000 +0000 +++ xfce4-taskmanager-1.0.1/INSTALL 2014-01-08 18:42:04.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -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 @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -304,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -362,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru xfce4-taskmanager-1.0.0/Makefile.in xfce4-taskmanager-1.0.1/Makefile.in --- xfce4-taskmanager-1.0.0/Makefile.in 2010-06-14 11:02:25.000000000 +0000 +++ xfce4-taskmanager-1.0.1/Makefile.in 2014-01-08 18:42:04.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,36 +80,48 @@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - THANKS compile config.guess config.sub depcomp install-sh \ - ltmain.sh missing mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING THANKS compile config.guess \ + config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -87,23 +143,54 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(desktopdir)" DATA = $(desktop_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -129,9 +216,12 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -157,6 +247,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -166,6 +257,10 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GKSU_CFLAGS = @GKSU_CFLAGS@ +GKSU_LIBS = @GKSU_LIBS@ +GKSU_REQUIRED_VERSION = @GKSU_REQUIRED_VERSION@ +GKSU_VERSION = @GKSU_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -184,6 +279,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -194,6 +293,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -214,6 +314,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -235,6 +337,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -263,6 +366,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -309,7 +414,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -345,10 +450,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(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 @@ -371,8 +474,11 @@ -rm -f libtool config.lt install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -386,27 +492,28 @@ @$(NORMAL_UNINSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -421,57 +528,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -487,12 +549,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -504,15 +561,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -521,9 +574,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -559,13 +634,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -594,36 +666,41 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives 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__remove_distdir) + $(am__post_remove_distdir) dist-shar: 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 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -634,8 +711,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -645,17 +722,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(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" \ + && ../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -678,13 +757,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -718,10 +805,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -804,25 +896,24 @@ uninstall-am: uninstall-desktopDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ install-desktopDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-desktopDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-desktopDATA @INTLTOOL_DESKTOP_RULE@ diff -Nru xfce4-taskmanager-1.0.0/NEWS xfce4-taskmanager-1.0.1/NEWS --- xfce4-taskmanager-1.0.0/NEWS 2010-06-14 10:50:23.000000000 +0000 +++ xfce4-taskmanager-1.0.1/NEWS 2014-01-08 18:42:02.000000000 +0000 @@ -1,3 +1,21 @@ +1.0.1 + +- Add "Run Task Manager as root" item in "Execute" menu +- Add a menu position function +- Fix shell substitution for Korn Shell (ksh) +- Set monitor's background box use the prelight state +- Remove quit tool button +- OpemBSD removed KERN_PROC2/KINFO_PROC2 some months ago. +- Translation updates: Arabic, Belarusian, Bulgarian, Catalan + (Valencian), Czech, Danish, German, Greek, English (Australia), + English (United Kingdom), Spanish (Castilian), Basque, Finnish, + French, Galician, Hebrew, Croatian, Hungarian, Indonesian, Icelandic, + Italian, Japanese, Kazakh, Korean, Lithuanian, Dutch (Flemish), + Occitan (post 1500), Polish, Portuguese, Portuguese (Brazilian), + Russian, Slovak, Slovenian, Serbian, Swedish, Telugu, Turkish, + Uyghur, Ukrainian, Chinese (China), Chinese (Hong Kong), Chinese + (Taiwan). + 1.0.0 - Replaced progress bars against monitors diff -Nru xfce4-taskmanager-1.0.0/aclocal.m4 xfce4-taskmanager-1.0.1/aclocal.m4 --- xfce4-taskmanager-1.0.0/aclocal.m4 2010-06-14 11:02:18.000000000 +0000 +++ xfce4-taskmanager-1.0.1/aclocal.m4 2014-01-08 18:42:03.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 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. @@ -11,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. @@ -260,6 +261,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -301,7 +306,7 @@ dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. + dnl in configure.ac. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -332,7 +337,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -430,7 +434,7 @@ dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_in,[],[ +ifdef(glib_configure_ac,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -454,7 +458,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -467,13 +471,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -486,25 +488,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -550,7 +575,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then @@ -649,8 +674,8 @@ # 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 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -659,8 +684,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -794,6 +819,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -816,10 +843,13 @@ dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -1276,7 +1306,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1390,15 +1420,12 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - _LT_PROG_XSI_SHELLFNS + _LT_PROG_REPLACE_SHELLFNS - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -1443,6 +1470,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1464,6 +1492,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1494,6 +1545,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1596,7 +1651,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + 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 lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1604,6 +1665,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1615,6 +1677,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1632,7 +1695,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + 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 lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1677,8 +1742,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1689,6 +1754,8 @@ _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\"`' + 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 @@ -1715,30 +1782,41 @@ fi ]) -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# 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 -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _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" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi ])# _LT_SYS_MODULE_PATH_AIX @@ -1763,7 +1841,7 @@ AC_MSG_CHECKING([how to print strings]) # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -1807,6 +1885,39 @@ ])# _LT_PROG_ECHO_BACKSLASH +# _LT_WITH_SYSROOT +# ---------------- +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).], +[], [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 #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + 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.])]) + # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], @@ -1928,14 +2039,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + 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" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1953,14 +2077,47 @@ ])# _LT_ENABLE_LOCK +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [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 + # 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 + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) +[_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1979,13 +2136,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2165,6 +2322,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -2204,7 +2366,7 @@ # 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"`func_fallback_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 do @@ -2300,10 +2462,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -2750,7 +2912,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2759,7 +2921,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2824,7 +2986,7 @@ ;; bsdi[[45]]*) - version_type=linux + 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' @@ -2843,8 +3005,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2877,13 +3040,71 @@ 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' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + 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" + 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'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + 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'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2904,7 +3125,7 @@ ;; dgux*) - version_type=linux + 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' @@ -2912,10 +3133,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2923,7 +3140,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2941,7 +3158,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2961,17 +3178,18 @@ ;; gnu*) - version_type=linux + 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 + 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" @@ -3032,7 +3250,7 @@ ;; interix[[3-9]]*) - version_type=linux + 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}' @@ -3048,7 +3266,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3085,9 +3303,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + 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}' @@ -3150,7 +3368,7 @@ ;; newsos6) - version_type=linux + 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}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3219,7 +3437,7 @@ ;; solaris*) - version_type=linux + 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}' @@ -3244,7 +3462,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + 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' shlibpath_var=LD_LIBRARY_PATH @@ -3268,7 +3486,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + 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' shlibpath_var=LD_LIBRARY_PATH @@ -3299,7 +3517,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + 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}' @@ -3309,7 +3527,7 @@ ;; uts4*) - version_type=linux + 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' shlibpath_var=LD_LIBRARY_PATH @@ -3587,6 +3805,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -3726,7 +3949,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3805,6 +4028,21 @@ ;; esac ]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -3812,7 +4050,11 @@ _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3915,6 +4157,67 @@ dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +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 + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + # LT_LIB_M # -------- @@ -4041,8 +4344,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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 -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'" # Handle CRLF in mingw tool chain opt_cr= @@ -4066,6 +4369,7 @@ # 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};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4078,6 +4382,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4111,6 +4416,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 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 + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -4122,7 +4439,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT@&t@_DLSYM_CONST struct { const char *name; void *address; } @@ -4148,15 +4465,15 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS 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 pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -4189,6 +4506,13 @@ AC_MSG_RESULT(ok) fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [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], @@ -4199,6 +4523,8 @@ _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_file_list_spec], [1], + [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -4210,7 +4536,6 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= -AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -4315,6 +4640,12 @@ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | 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']) + ;; dgux*) case $cc_basename in ec++*) @@ -4623,7 +4954,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4689,6 +5022,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; + 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' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4709,18 +5048,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*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' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4808,9 +5162,11 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) # # Check to make sure the PIC flag actually works. @@ -4829,6 +5185,8 @@ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4849,6 +5207,7 @@ m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4857,6 +5216,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. @@ -4871,15 +5231,22 @@ ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4894,7 +5261,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5047,7 +5413,8 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _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' @@ -5095,7 +5462,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -5144,8 +5511,7 @@ 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)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $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 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5165,8 +5531,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _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(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 ;; @@ -5184,8 +5550,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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(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 @@ -5231,8 +5597,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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(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 @@ -5362,7 +5728,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _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" else @@ -5373,7 +5739,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _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. @@ -5417,20 +5783,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - 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. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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=' + # 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 + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # 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' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac ;; darwin* | rhapsody*) @@ -5443,10 +5853,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5459,7 +5865,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5468,7 +5874,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5476,7 +5882,7 @@ hpux9*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _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' 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' fi @@ -5492,13 +5898,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${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' 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' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5516,10 +5921,10 @@ _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 -fPIC ${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 -fPIC ${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 @@ -5566,16 +5971,31 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $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' + _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. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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" + # 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" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + 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' + 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' @@ -5660,7 +6080,7 @@ 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} $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(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 \*' @@ -5679,9 +6099,9 @@ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _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 ${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"*) @@ -5925,9 +6345,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5953,8 +6370,6 @@ to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5965,6 +6380,8 @@ [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -6062,6 +6479,7 @@ 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 @@ -6080,7 +6498,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6123,6 +6540,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -6140,6 +6558,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6161,8 +6580,8 @@ # 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 -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -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(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' @@ -6303,7 +6722,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX + _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" @@ -6315,7 +6734,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _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. @@ -6357,29 +6776,75 @@ ;; cygwin* | mingw* | pw32* | cegcc*) - # _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(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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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=' + # 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' + ;; + *) + # 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(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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -6402,7 +6867,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6454,7 +6919,7 @@ ;; *) if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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 -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' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6525,10 +6990,10 @@ _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 -fPIC ${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 -fPIC ${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 @@ -6569,9 +7034,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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' + _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 -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 @@ -6849,7 +7314,7 @@ _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}-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 @@ -6936,9 +7401,9 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; 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 -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 $LDFLAGS $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 -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 -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 @@ -7067,6 +7532,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -7081,6 +7547,29 @@ ])# _LT_LANG_CXX_CONFIG +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf 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). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +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}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7089,6 +7578,7 @@ # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -7138,7 +7628,20 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -7150,7 +7653,7 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -7159,13 +7662,22 @@ test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + 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. @@ -7185,8 +7697,10 @@ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -7222,6 +7736,7 @@ fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -7321,7 +7836,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7371,7 +7885,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} + CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7425,6 +7941,7 @@ GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP @@ -7451,7 +7968,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7501,7 +8017,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} + CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -7557,7 +8075,8 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -7594,10 +8113,12 @@ _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=yes CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -7624,31 +8145,32 @@ AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# 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'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE -# Source file extension for RC test sources. -ac_ext=rc +# Source file extension for Go test sources. +ac_ext=go -# Object file extension for compiled RC test sources. +# Object file extension for compiled Go test sources. objext=o _LT_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +lt_simple_compile_test_code="package main; func main() { }" # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code='package main; func main() { }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7658,28 +8180,98 @@ _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= -CC=${RC-"windres"} +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" _LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds if test -n "$compiler"; then - : + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + _LT_CONFIG($1) fi -GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" -])# _LT_LANG_RC_CONFIG +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG -# LT_PROG_GCJ -# ----------- + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# 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'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +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" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], @@ -7694,6 +8286,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7733,6 +8332,15 @@ AC_SUBST([OBJDUMP]) ]) +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) # _LT_DECL_SED # ------------ @@ -7824,8 +8432,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + 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 @@ -7864,209 +8472,165 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# 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 -# to NONDIR_REPLACEMENT. -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# 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_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}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} +# _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=: +]) -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} +# _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_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) -# 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 () -{ - # Extract subdirectory from the argument. - 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 -} + _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##*/}"]) -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} + _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]) -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -# 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 -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} + _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"]) -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} + # 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 -_LT_EOF -esac +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which 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], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac ;; - esac + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac ]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS # Helper functions for option handling. -*- Autoconf -*- # @@ -8393,9 +8957,24 @@ # 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], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -8565,17 +9144,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 3169 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.8]) -m4_define([LT_PACKAGE_REVISION], [1.3169]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.8' -macro_revision='1.3169' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -8680,7 +9259,7 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 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, @@ -8712,7 +9291,222 @@ AC_SUBST([USE_NLS]) ]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# 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. +# +# 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. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[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. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8724,10 +9518,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.11' +[am__api_version='1.14' 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.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8743,22 +9537,22 @@ # 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.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])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, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-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. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -8777,7 +9571,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -8803,22 +9597,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-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. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -8837,16 +9628,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# 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. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -8856,7 +9645,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -8869,12 +9658,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -8882,8 +9672,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -8922,16 +9713,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -8940,16 +9731,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -8997,7 +9788,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -9007,34 +9798,39 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# 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. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -9047,7 +9843,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -9059,21 +9855,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -9091,7 +9885,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -9099,32 +9893,23 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# 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. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-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. -# serial 16 - # 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]) # ----------------------------------------------- @@ -9137,7 +9922,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9166,31 +9951,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -9201,34 +9995,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# 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 Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further 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 # that is generated. The stamp files are numbered to have different names. @@ -9250,7 +10088,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9269,16 +10107,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-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. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -9295,20 +10131,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-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. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -9316,13 +10149,14 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -9330,18 +10164,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-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. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -9359,7 +10189,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -9384,52 +10214,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# 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. - -# serial 6 - -# 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, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-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. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -9437,11 +10229,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -9454,63 +10245,64 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# -*- Autoconf -*- +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. +# +# Copyright (C) 1996-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_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) + +AC_DEFUN([AM_C_PROTOTYPES], + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-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. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -9521,24 +10313,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# 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. -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# _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-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. -# serial 5 +# 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. +# +# 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_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -9549,32 +10399,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -9584,36 +10442,85 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-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. -# serial 1 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9621,34 +10528,32 @@ # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-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. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -9656,24 +10561,22 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-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. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -9683,75 +10586,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR @@ -9763,19 +10705,19 @@ dnl dnl Written for Xfce by Benedikt Meurer . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-depends dnl ----------- @@ -9801,11 +10743,23 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) + m4_ifdef([PKG_PROG_PKG_CONFIG], + [ + PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION]) - if test x"$PKG_CONFIG" = x"no"; then + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + ], + [ + echo echo "*** The pkg-config utility could not be found on your system." echo "*** Make sure it is in your path, or set the PKG_CONFIG" echo "*** environment variable to the full path to pkg-config." @@ -9815,25 +10769,7 @@ echo "*** http://www.freedesktop.org/software/pkgconfig" echo "***" exit 1 - fi - - # check pkg-config version - AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION]) - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi - fi + ]) ]) @@ -9966,30 +10902,6 @@ -dnl BM_DEPEND(varname, package, version) -dnl -dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept -dnl for backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND], -[ - XDT_CHECK_PACKAGE([$1], [$2], [$3]) -]) - - - -dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default) -dnl -dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND_CHECK], -[ - XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6]) -]) - - - dnl XDT_CHECK_LIBX11() dnl dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS @@ -10126,66 +11038,6 @@ ]) - -dnl BM_LIBX11() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11], -[ - AC_REQUIRE([XDT_CHECK_LIBX11]) -]) - - - -dnl BM_LIBX11_REQUIRE() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE]) -]) - - - -dnl BM_LIBSM() -dnl -dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBSM], -[ - AC_REQUIRE([XDT_CHECK_LIBSM]) -]) - - - -dnl BM_LIBXPM -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM]) -]) - - - -dnl BM_LIBXPM_REQUIRE -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for -dnl backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE]) -]) - - dnl $Id$ dnl dnl Copyright (c) 2002-2006 @@ -10193,19 +11045,19 @@ dnl dnl Written for Xfce by Benedikt Meurer . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-depends dnl ----------- @@ -10230,7 +11082,7 @@ AC_MSG_CHECKING([if $CC supports $flag]) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) CFLAGS="$saved_CFLAGS" AC_MSG_RESULT([$flag_supported]) @@ -10262,17 +11114,25 @@ -Wno-missing-field-initializers \ -Wno-unused-parameter -Wold-style-definition \ -Wdeclaration-after-statement \ - -Wmissing-declarations -Wredundant-decls \ + -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs \ - -fstack-protector" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" - + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" + + if test x`uname` = x"Linux"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + fi + + dnl # signal.h inline is crapy on openbsd + if test x`uname` != x"OpenBSD"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" + fi + if test x"$enable_debug" = x"full"; then AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" AC_MSG_RESULT([full]) else @@ -10299,7 +11159,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" AC_MSG_RESULT([no]) else AC_MSG_RESULT([minimum]) @@ -10326,7 +11186,7 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $xdt_vis_test_cflags" AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE( + AC_COMPILE_IFELSE([AC_LANG_SOURCE( [ void test_default (void); void test_hidden (void); @@ -10339,7 +11199,7 @@ test_hidden (); return 0; } - ]), + ])], [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) @@ -10352,7 +11212,11 @@ if test "x$have_gnuc_visibility" = "xyes"; then CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" - XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) + xdt_vis_hidden_cflags="" + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden]) + if test "x$xdt_vis_hidden_cflags" = "x"; then + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) + fi CFLAGS="$CFLAGS $xdt_vis_hidden_cflags" fi @@ -10371,16 +11235,18 @@ [enable_linker_opts=$enableval], [enable_linker_opts=yes]) if test "x$enable_linker_opts" != "xno"; then - AC_MSG_CHECKING([whether $LD accepts --as-needed]) - case `$LD --as-needed -v 2>&1 &1 &1 &1 . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-i18n dnl -------- @@ -10550,16 +11338,3 @@ ]) - -dnl BM_I18N(PACKAGE, LINGUAS) -dnl -dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for -dnl backward compatibility. Will be removed in the -dnl future. -dnl -AC_DEFUN([BM_I18N], -[ - XDT_I18N([$2], [$1]) -]) - - diff -Nru xfce4-taskmanager-1.0.0/compile xfce4-taskmanager-1.0.1/compile --- xfce4-taskmanager-1.0.0/compile 2010-06-14 11:02:23.000000000 +0000 +++ xfce4-taskmanager-1.0.1/compile 2014-01-08 18:42:04.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru xfce4-taskmanager-1.0.0/config.guess xfce4-taskmanager-1.0.1/config.guess --- xfce4-taskmanager-1.0.0/config.guess 2010-06-14 11:02:23.000000000 +0000 +++ xfce4-taskmanager-1.0.1/config.guess 2014-01-08 18:42:04.000000000 +0000 @@ -1,14 +1,12 @@ #! /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 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-11-29' # 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 @@ -17,26 +15,22 @@ # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # 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. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +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 Free Software Foundation, Inc. +Copyright 1992-2013 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." @@ -139,12 +132,33 @@ 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'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +194,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -201,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -223,7 +241,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +287,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +316,12 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -394,23 +415,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +501,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +515,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +572,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +615,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +751,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +790,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,30 +809,35 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -848,15 +874,22 @@ 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-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,52 +899,56 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + 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 - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + 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 cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + 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 @@ -930,51 +967,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; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + 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-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-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. @@ -983,11 +1032,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1068,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1096,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1137,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1181,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1210,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1178,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1204,19 +1256,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]*:*) @@ -1230,7 +1294,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1342,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,11 +1366,11 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru xfce4-taskmanager-1.0.0/config.h.in xfce4-taskmanager-1.0.1/config.h.in --- xfce4-taskmanager-1.0.0/config.h.in 2010-06-14 11:02:21.000000000 +0000 +++ xfce4-taskmanager-1.0.1/config.h.in 2014-01-08 18:42:03.000000000 +0000 @@ -30,6 +30,9 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT +/* Define if libgksu2 >= 2.0 present */ +#undef HAVE_GKSU + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -121,9 +124,6 @@ */ #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 diff -Nru xfce4-taskmanager-1.0.0/config.sub xfce4-taskmanager-1.0.1/config.sub --- xfce4-taskmanager-1.0.0/config.sub 2010-06-14 11:02:23.000000000 +0000 +++ xfce4-taskmanager-1.0.1/config.sub 2014-01-08 18:42:04.000000000 +0000 @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-11-20' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-10-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 +# 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. +# 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,8 +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 Free Software Foundation, Inc. +Copyright 1992-2013 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." @@ -123,13 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -152,12 +149,12 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +170,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,20 +248,28 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | 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 \ | 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 \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,34 +287,45 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | 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 \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +335,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,25 +364,31 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | 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-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -363,29 +406,34 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +528,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,11 +788,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -771,10 +831,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +907,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +995,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -948,7 +1023,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1017,6 +1096,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1155,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1226,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1326,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1281,20 +1354,21 @@ -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* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1415,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1464,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1426,15 +1500,14 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1530,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1545,23 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1581,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1509,6 +1594,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1527,7 +1615,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru xfce4-taskmanager-1.0.0/configure xfce4-taskmanager-1.0.1/configure --- xfce4-taskmanager-1.0.0/configure 2010-06-14 11:02:27.000000000 +0000 +++ xfce4-taskmanager-1.0.1/configure 2014-01-08 18:42:04.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac e96703c. +# From configure.ac b8e8789. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for Xfce4 Taskmanager 1.0.0. +# Generated by GNU Autoconf 2.69 for Xfce4 Taskmanager 1.0.1. # # Report bugs to . # @@ -9,9 +9,7 @@ # The Xfce development team. All rights reserved. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -95,6 +93,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -139,6 +138,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -172,7 +196,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -225,14 +250,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -331,10 +367,18 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -371,19 +415,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -456,6 +500,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -490,16 +538,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -511,28 +559,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -547,7 +575,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -566,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='Xfce4 Taskmanager' PACKAGE_TARNAME='xfce4-taskmanager' -PACKAGE_VERSION='1.0.0' -PACKAGE_STRING='Xfce4 Taskmanager 1.0.0' +PACKAGE_VERSION='1.0.1' +PACKAGE_STRING='Xfce4 Taskmanager 1.0.1' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='http://goodies.xfce.org/projects/applications/xfce4-taskmanager' @@ -621,6 +649,12 @@ OS_BSD_TRUE OS_FREEBSD_FALSE OS_FREEBSD_TRUE +HAVE_GKSU_FALSE +HAVE_GKSU_TRUE +GKSU_REQUIRED_VERSION +GKSU_LIBS +GKSU_CFLAGS +GKSU_VERSION HAVE_WNCK_FALSE HAVE_WNCK_TRUE WNCK_REQUIRED_VERSION @@ -635,6 +669,8 @@ GTK_LIBS GTK_CFLAGS GTK_VERSION +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG XGETTEXT_ARGS MKINSTALLDIRS @@ -675,6 +711,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -685,8 +727,11 @@ LIPO NMEDIT DSYMUTIL +MANIFEST_TOOL RANLIB +ac_ct_AR AR +DLLTOOL OBJDUMP LN_S NM @@ -701,6 +746,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -714,11 +760,13 @@ LDFLAGS CFLAGS CC -AM_BACKSLASH -AM_DEFAULT_VERBOSITY MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -795,18 +843,20 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode enable_dependency_tracking with_gnu_ld enable_shared enable_static with_pic enable_fast_install +with_sysroot enable_libtool_lock enable_nls with_locales_dir enable_wnck +enable_gksu with_skel enable_debug ' @@ -818,7 +868,10 @@ LDFLAGS LIBS CPPFLAGS -CPP' +CPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR' # Initialize some variables set by options. @@ -881,8 +934,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -927,7 +981,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -953,7 +1007,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1157,7 +1211,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1173,7 +1227,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1203,8 +1257,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1212,7 +1266,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1222,7 +1276,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1230,13 +1284,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1259,7 +1313,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1273,8 +1327,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1289,9 +1341,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1330,11 +1382,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1360,7 +1412,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 Xfce4 Taskmanager 1.0.0 to adapt to many kinds of systems. +\`configure' configures Xfce4 Taskmanager 1.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1374,7 +1426,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1432,7 +1484,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xfce4 Taskmanager 1.0.0:";; + short | recursive ) echo "Configuration of Xfce4 Taskmanager 1.0.1:";; esac cat <<\_ACEOF @@ -1440,12 +1492,15 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1456,6 +1511,10 @@ icons/names (default=[yes]) --disable-wnck Disable checking for building with libwnck for window icons/names + --enable-gksu Enable checking for building with libgksu to run as + root (default=[yes]) + --disable-gksu Disable checking for building with libgksu to run as + root --enable-debug[=no|minimum|yes|full] Build with debugging support [default=[]] --disable-debug Include no debugging support @@ -1464,8 +1523,10 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-locales-dir=DIR Install locales into DIR @@ -1480,6 +1541,11 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1548,10 +1614,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xfce4 Taskmanager configure 1.0.0 -generated by GNU Autoconf 2.65 +Xfce4 Taskmanager configure 1.0.1 +generated by GNU Autoconf 2.69 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -1598,7 +1664,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1630,7 +1696,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1644,7 +1710,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1658,7 +1724,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1676,7 +1742,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1701,7 +1767,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1712,7 +1778,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1754,7 +1820,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1767,7 +1833,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1822,7 +1888,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1834,10 +1900,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1873,7 +1939,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1896,17 +1962,15 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ---------------------------------------- ## +( $as_echo "## ---------------------------------------- ## ## Report this to http://bugzilla.xfce.org/ ## -## ---------------------------------------- ## -_ASBOX +## ---------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1915,15 +1979,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xfce4 Taskmanager $as_me 1.0.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by Xfce4 Taskmanager $as_me 1.0.1, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2033,11 +2097,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2071,11 +2133,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2088,11 +2148,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2106,11 +2164,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2165,7 +2221,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2180,7 +2241,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2256,7 +2321,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2272,16 +2337,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2295,27 +2366,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2333,14 +2404,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -2348,7 +2419,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2366,14 +2437,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then : +if ${ac_cv_target+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi @@ -2381,7 +2452,7 @@ $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2405,7 +2476,7 @@ program_prefix=${target_alias}- -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2424,7 +2495,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2444,7 +2515,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2502,56 +2573,71 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2574,12 +2660,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2591,17 +2677,17 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2613,7 +2699,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2641,7 +2727,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2653,7 +2739,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2694,7 +2780,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2704,7 +2790,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2733,19 +2819,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2757,7 +2837,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2785,7 +2865,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2793,7 +2873,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2821,13 +2901,52 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2843,7 +2962,7 @@ # Define the identity of the package. PACKAGE='xfce4-taskmanager' - VERSION='1.0.0' + VERSION='1.0.1' cat >>confdefs.h <<_ACEOF @@ -2871,18 +2990,70 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# 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}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# 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 ac_config_headers="$ac_config_headers config.h" @@ -2913,11 +3084,38 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' @@ -2931,7 +3129,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2943,7 +3141,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2971,7 +3169,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2983,7 +3181,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3024,7 +3222,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3036,7 +3234,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3064,7 +3262,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3077,7 +3275,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3123,7 +3321,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3135,7 +3333,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3167,7 +3365,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3179,7 +3377,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3221,8 +3419,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3336,9 +3534,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3380,8 +3577,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3438,9 +3635,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3451,7 +3648,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3491,8 +3688,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3502,7 +3699,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3539,7 +3736,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3617,7 +3814,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3626,8 +3823,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3711,6 +3907,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" @@ -3730,7 +3985,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3763,6 +4018,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3778,15 +4034,16 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3820,16 +4077,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3838,16 +4095,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3901,135 +4158,10 @@ 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 { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4049,7 +4181,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4084,7 +4216,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -4111,7 +4243,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4125,7 +4257,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4160,7 +4292,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4174,7 +4306,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4191,7 +4323,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4226,7 +4358,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4241,7 +4373,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then : +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -4258,7 +4390,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4293,7 +4425,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -4331,7 +4463,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -4424,7 +4556,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -4461,10 +4593,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then : +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -4498,8 +4630,8 @@ -macro_version='2.2.8' -macro_revision='1.3169' +macro_version='2.4.2' +macro_revision='1.3337' @@ -4534,7 +4666,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then : +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -4597,7 +4729,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -4609,7 +4741,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4641,7 +4773,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -4653,7 +4785,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4713,7 +4845,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then : +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" @@ -4748,7 +4880,7 @@ # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -4811,6 +4943,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -4850,7 +4987,7 @@ # 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"`func_fallback_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 do @@ -4893,8 +5030,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + 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 @@ -4943,9 +5080,83 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then : +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -4959,6 +5170,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -4981,7 +5197,7 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -4993,7 +5209,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5021,7 +5237,7 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5033,7 +5249,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5080,7 +5296,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then : +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5200,7 +5416,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5282,13 +5498,180 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +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 + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -5298,11 +5681,13 @@ if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -5314,8 +5699,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5335,14 +5720,18 @@ fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -5354,8 +5743,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5374,6 +5763,10 @@ $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else @@ -5385,16 +5778,72 @@ esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; 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 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $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 + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi @@ -5407,7 +5856,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -5419,7 +5868,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5447,7 +5896,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -5459,7 +5908,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5506,7 +5955,7 @@ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -5518,7 +5967,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5546,7 +5995,7 @@ set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -5558,7 +6007,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5608,13 +6057,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -5675,7 +6124,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5736,8 +6185,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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 -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'" # Handle CRLF in mingw tool chain opt_cr= @@ -5761,6 +6210,7 @@ # 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};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -5773,6 +6223,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -5814,6 +6265,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 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 + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#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 + #ifdef __cplusplus extern "C" { #endif @@ -5825,7 +6288,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -5851,8 +6314,8 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -5862,8 +6325,8 @@ test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -5900,6 +6363,15 @@ $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + @@ -5922,6 +6394,45 @@ + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $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 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; @@ -6047,7 +6558,7 @@ 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; } -if test "${lt_cv_cc_needs_belf+set}" = set; then : +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6088,7 +6599,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6099,7 +6610,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + 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" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -6115,19 +6639,16 @@ need_locks="$enable_libtool_lock" - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +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. +set dummy ${ac_tool_prefix}mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6135,8 +6656,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6146,10 +6667,10 @@ fi fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6157,17 +6678,17 @@ fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6175,8 +6696,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6186,17 +6707,17 @@ fi fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -6204,22 +6725,50 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - DSYMUTIL=$ac_ct_DSYMUTIL + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL fi else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* 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 + MANIFEST_TOOL=: +fi + + + + + + case $host_os in + rhapsody* | darwin*) if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then : +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6227,8 +6776,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6238,10 +6787,102 @@ fi fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6255,7 +6896,7 @@ set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -6267,7 +6908,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6307,7 +6948,7 @@ set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then : +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -6319,7 +6960,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6347,7 +6988,7 @@ set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -6359,7 +7000,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6399,7 +7040,7 @@ set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then : +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -6411,7 +7052,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6439,7 +7080,7 @@ set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -6451,7 +7092,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6491,7 +7132,7 @@ set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then : +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -6503,7 +7144,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6531,7 +7172,7 @@ set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -6543,7 +7184,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6606,7 +7247,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -6622,7 +7263,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + 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 lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -6633,9 +7280,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -6665,9 +7313,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } -if test "${lt_cv_ld_force_load+set}" = set; then : +if ${lt_cv_ld_force_load+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_force_load=no @@ -6686,7 +7335,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + 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 lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -6744,7 +7395,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6774,7 +7425,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6790,11 +7441,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -6833,7 +7484,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6849,18 +7500,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6872,7 +7523,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6989,8 +7640,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7004,7 +7654,7 @@ do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -7092,7 +7742,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -7170,6 +7835,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -7191,7 +7860,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then : +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -7269,7 +7938,7 @@ if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7335,7 +8004,7 @@ if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7473,7 +8142,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -7526,8 +8195,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7627,7 +8294,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -7692,6 +8361,12 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -7712,18 +8387,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -7811,13 +8501,17 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -7825,7 +8519,7 @@ if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -7878,13 +8572,18 @@ + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -7927,7 +8626,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -7982,7 +8681,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8076,7 +8775,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -8228,7 +8926,8 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + 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' @@ -8276,7 +8975,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -8325,8 +9024,7 @@ 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= - hardcode_libdir_flag_spec_ld='-rpath $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 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -8346,8 +9044,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - 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' + 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 ;; @@ -8365,8 +9063,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - 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' + 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 @@ -8412,8 +9110,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - 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' + 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 @@ -8543,7 +9241,13 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8556,22 +9260,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + 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" @@ -8583,7 +9294,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8596,22 +9313,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -8656,20 +9380,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - 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. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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=' + # 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 + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # 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' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -8681,6 +9449,7 @@ 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\"`' + else whole_archive_flag_spec='' fi @@ -8709,10 +9478,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -8725,7 +9490,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -8734,7 +9499,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -8742,7 +9507,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + 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' 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' fi @@ -8758,13 +9523,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${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' 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' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -8782,10 +9546,10 @@ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${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 -fPIC ${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 @@ -8802,7 +9566,7 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 $as_echo_n "checking if $CC understands -b... " >&6; } -if test "${lt_cv_prog_compiler__b+set}" = set; then : +if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no @@ -8864,23 +9628,36 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $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' + 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. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +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" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo(void) {} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $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' - + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no 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' + 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' @@ -8965,7 +9742,7 @@ 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} $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' + 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 \*' @@ -8984,9 +9761,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + 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 ${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"*) @@ -9174,7 +9951,7 @@ # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : +if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -9375,11 +10152,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -9469,7 +10241,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -9478,7 +10250,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -9543,7 +10315,7 @@ ;; bsdi[45]*) - version_type=linux + 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' @@ -9562,8 +10334,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -9596,13 +10369,71 @@ 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' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + 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" + 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'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + 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'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -9623,7 +10454,7 @@ ;; dgux*) - version_type=linux + 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' @@ -9631,10 +10462,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -9642,7 +10469,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -9660,7 +10487,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -9680,17 +10507,18 @@ ;; gnu*) - version_type=linux + 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 + 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" @@ -9751,7 +10579,7 @@ ;; interix[3-9]*) - version_type=linux + 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}' @@ -9767,7 +10595,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -9804,9 +10632,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + 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}' @@ -9816,7 +10644,7 @@ shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -9888,7 +10716,7 @@ ;; newsos6) - version_type=linux + 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}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9957,7 +10785,7 @@ ;; solaris*) - version_type=linux + 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}' @@ -9982,7 +10810,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + 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' shlibpath_var=LD_LIBRARY_PATH @@ -10006,7 +10834,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + 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' shlibpath_var=LD_LIBRARY_PATH @@ -10037,7 +10865,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + 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}' @@ -10047,7 +10875,7 @@ ;; uts4*) - version_type=linux + 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' shlibpath_var=LD_LIBRARY_PATH @@ -10236,7 +11064,7 @@ # 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 test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10270,7 +11098,7 @@ fi { $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" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10284,12 +11112,12 @@ *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : 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; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10323,16 +11151,16 @@ fi { $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" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : 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" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; then : 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; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10366,12 +11194,12 @@ fi { $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" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 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; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10405,12 +11233,12 @@ fi { $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" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : 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; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10444,7 +11272,7 @@ fi { $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" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10485,7 +11313,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then : +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10538,10 +11366,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10591,7 +11419,7 @@ 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 test "${lt_cv_dlopen_self_static+set}" = set; then : +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10644,10 +11472,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10829,6 +11657,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -10855,31 +11685,29 @@ case "$am__api_version" in 1.01234) - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n ""; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 $as_echo_n "checking for intltool >= ... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error "Your intltool is too old. You need intltool or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -10893,7 +11721,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10919,7 +11747,7 @@ set dummy intltool-merge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -10933,7 +11761,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10959,7 +11787,7 @@ set dummy intltool-extract; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -10973,7 +11801,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10996,28 +11824,51 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 +fi + +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -11120,7 +11971,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -11134,7 +11985,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11160,7 +12011,7 @@ set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -11174,7 +12025,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11200,7 +12051,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -11214,7 +12065,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11240,7 +12091,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -11254,7 +12105,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11278,20 +12129,20 @@ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : +if ${ac_cv_path_INTLTOOL_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -11305,7 +12156,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11328,15 +12179,15 @@ if test -z "$INTLTOOL_PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -11347,7 +12198,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -11375,7 +12226,7 @@ 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" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -11426,7 +12277,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11435,11 +12286,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -11456,8 +12307,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -11473,10 +12325,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -11507,7 +12359,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11621,8 +12473,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -11641,12 +12492,12 @@ - ALL_LINGUAS="ar ast be ca cs da de el en_GB es eu fi fr gl hr hu id it ja kk lv nb nl pa pl pt pt_BR ru si sk sq sv tr ug uk ur ur_PK vi zh_CN zh_TW " + ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl oc pa pl pt pt_BR ru si sk sl sq sr sv te tr ug uk ur ur_PK vi zh_CN zh_HK zh_TW " for ac_header in locale.h do : ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = x""yes; then : +if test "x$ac_cv_header_locale_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALE_H 1 _ACEOF @@ -11658,7 +12509,7 @@ if test $ac_cv_header_locale_h = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then : +if ${am_cv_val_LC_MESSAGES+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11698,7 +12549,7 @@ INTLLIBS= ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = x""yes; then : +if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -11707,7 +12558,7 @@ # { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 $as_echo_n "checking for ngettext in libc... " >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then : +if ${gt_cv_func_ngettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11738,7 +12589,7 @@ if test "$gt_cv_func_ngettext_libc" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 $as_echo_n "checking for dgettext in libc... " >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then : +if ${gt_cv_func_dgettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11771,7 +12622,7 @@ for ac_func in bind_textdomain_codeset do : ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -11790,7 +12641,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : +if ${ac_cv_lib_intl_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11824,10 +12675,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : +if ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11861,10 +12712,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 $as_echo_n "checking for dgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then : +if ${ac_cv_lib_intl_dgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11898,7 +12749,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 $as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : +if test "x$ac_cv_lib_intl_dgettext" = xyes; then : gt_cv_func_dgettext_libintl=yes fi @@ -11914,7 +12765,7 @@ $as_echo "" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : +if ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11948,10 +12799,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : +if ${ac_cv_lib_intl_dcgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11985,7 +12836,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : +if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -12010,7 +12861,7 @@ for ac_func in bind_textdomain_codeset do : ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -12048,7 +12899,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -12085,7 +12936,7 @@ for ac_func in dcgettext do : ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = x""yes; then : +if test "x$ac_cv_func_dcgettext" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DCGETTEXT 1 _ACEOF @@ -12126,7 +12977,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -12140,7 +12991,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12167,7 +13018,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -12218,7 +13069,7 @@ 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" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -12227,6 +13078,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -12348,7 +13203,7 @@ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : fi @@ -12390,13 +13245,21 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -12410,7 +13273,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12419,7 +13282,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -12433,44 +13295,94 @@ fi - - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi - - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.12.0" >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.12.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.12.0" "gtk+-2.0" >/dev/null 2>&1; then +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.12.0" >&5 +$as_echo_n "checking for gtk+-2.0 >= 2.12.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.12.0" "gtk+-2.0" >/dev/null 2>&1; then GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 $as_echo "$GTK_VERSION" >&6; } @@ -12528,13 +13440,21 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -12548,7 +13468,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12557,7 +13477,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -12571,39 +13490,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo >= 1.5.0" >&5 @@ -12639,54 +13608,305 @@ $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package cairo was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade cairo to atleast version 1.5.0, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." - exit 1 + echo "*** The required package cairo was found on your system," + echo "*** but the installed version ($xdt_cv_version) is too old." + echo "*** Please upgrade cairo to atleast version 1.5.0, or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you installed" + echo "*** the new version of the package in a nonstandard prefix so" + echo "*** pkg-config is able to find it." + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + + + echo "*** The required package cairo was not found on your system." + echo "*** Please install cairo (atleast version 1.5.0) or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you" + echo "*** installed the package in a nonstandard prefix so that" + echo "*** pkg-config is able to find it." + exit 1 + + fi + + + + + + # Check whether --enable-wnck was given. +if test "${enable_wnck+set}" = set; then : + enableval=$enable_wnck; xdt_cv_WNCK_check=$enableval +else + xdt_cv_WNCK_check=yes +fi + + + if test x"$xdt_cv_WNCK_check" = x"yes"; then + if $PKG_CONFIG --exists "libwnck-1.0 >= 2.0" >/dev/null 2>&1; then + + + # minimum supported version of pkg-config + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwnck-1.0 >= 2.0" >&5 +$as_echo_n "checking for libwnck-1.0 >= 2.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.0" "libwnck-1.0" >/dev/null 2>&1; then + WNCK_VERSION=`$PKG_CONFIG --modversion "libwnck-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WNCK_VERSION" >&5 +$as_echo "$WNCK_VERSION" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking WNCK_CFLAGS" >&5 +$as_echo_n "checking WNCK_CFLAGS... " >&6; } + WNCK_CFLAGS=`$PKG_CONFIG --cflags "libwnck-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WNCK_CFLAGS" >&5 +$as_echo "$WNCK_CFLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking WNCK_LIBS" >&5 +$as_echo_n "checking WNCK_LIBS... " >&6; } + WNCK_LIBS=`$PKG_CONFIG --libs "libwnck-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WNCK_LIBS" >&5 +$as_echo "$WNCK_LIBS" >&6; } + + WNCK_REQUIRED_VERSION=2.0 + + + + + + + + +$as_echo "#define HAVE_WNCK 1" >>confdefs.h + + WNCK_FOUND="yes" + + elif $PKG_CONFIG --exists "libwnck-1.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libwnck-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +$as_echo "found, but $xdt_cv_version" >&6; } + + + echo "*** The required package libwnck-1.0 was found on your system," + echo "*** but the installed version ($xdt_cv_version) is too old." + echo "*** Please upgrade libwnck-1.0 to atleast version 2.0, or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you installed" + echo "*** the new version of the package in a nonstandard prefix so" + echo "*** pkg-config is able to find it." + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + + + echo "*** The required package libwnck-1.0 was not found on your system." + echo "*** Please install libwnck-1.0 (atleast version 2.0) or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you" + echo "*** installed the package in a nonstandard prefix so that" + echo "*** pkg-config is able to find it." + exit 1 + + fi + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libwnck-1.0 >= 2.0" >&5 +$as_echo_n "checking for optional package libwnck-1.0 >= 2.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libwnck-1.0" >&5 +$as_echo_n "checking for optional package libwnck-1.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } + fi + + if test x"$WNCK_FOUND" = x"yes"; then + HAVE_WNCK_TRUE= + HAVE_WNCK_FALSE='#' +else + HAVE_WNCK_TRUE='#' + HAVE_WNCK_FALSE= +fi + + + if test x"$WNCK_FOUND" = x"yes"; then + HAVE_WNCK_TRUE= + HAVE_WNCK_FALSE='#' +else + HAVE_WNCK_TRUE='#' + HAVE_WNCK_FALSE= +fi + + - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + # Check whether --enable-gksu was given. +if test "${enable_gksu+set}" = set; then : + enableval=$enable_gksu; xdt_cv_GKSU_check=$enableval +else + xdt_cv_GKSU_check=yes +fi - echo "*** The required package cairo was not found on your system." - echo "*** Please install cairo (atleast version 1.5.0) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." - exit 1 - fi + if test x"$xdt_cv_GKSU_check" = x"yes"; then + if $PKG_CONFIG --exists "libgksu2 >= 2.0" >/dev/null 2>&1; then + # minimum supported version of pkg-config + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # Check whether --enable-wnck was given. -if test "${enable_wnck+set}" = set; then : - enableval=$enable_wnck; xdt_cv_WNCK_check=$enableval -else - xdt_cv_WNCK_check=yes -fi - if test x"$xdt_cv_WNCK_check" = x"yes"; then - if $PKG_CONFIG --exists "libwnck-1.0 >= 2.0" >/dev/null 2>&1; then - # minimum supported version of pkg-config - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -12700,7 +13920,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12709,7 +13929,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -12723,82 +13942,132 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwnck-1.0 >= 2.0" >&5 -$as_echo_n "checking for libwnck-1.0 >= 2.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.0" "libwnck-1.0" >/dev/null 2>&1; then - WNCK_VERSION=`$PKG_CONFIG --modversion "libwnck-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WNCK_VERSION" >&5 -$as_echo "$WNCK_VERSION" >&6; } + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking WNCK_CFLAGS" >&5 -$as_echo_n "checking WNCK_CFLAGS... " >&6; } - WNCK_CFLAGS=`$PKG_CONFIG --cflags "libwnck-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WNCK_CFLAGS" >&5 -$as_echo "$WNCK_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking WNCK_LIBS" >&5 -$as_echo_n "checking WNCK_LIBS... " >&6; } - WNCK_LIBS=`$PKG_CONFIG --libs "libwnck-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WNCK_LIBS" >&5 -$as_echo "$WNCK_LIBS" >&6; } - WNCK_REQUIRED_VERSION=2.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgksu2 >= 2.0" >&5 +$as_echo_n "checking for libgksu2 >= 2.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.0" "libgksu2" >/dev/null 2>&1; then + GKSU_VERSION=`$PKG_CONFIG --modversion "libgksu2"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GKSU_VERSION" >&5 +$as_echo "$GKSU_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GKSU_CFLAGS" >&5 +$as_echo_n "checking GKSU_CFLAGS... " >&6; } + GKSU_CFLAGS=`$PKG_CONFIG --cflags "libgksu2"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GKSU_CFLAGS" >&5 +$as_echo "$GKSU_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GKSU_LIBS" >&5 +$as_echo_n "checking GKSU_LIBS... " >&6; } + GKSU_LIBS=`$PKG_CONFIG --libs "libgksu2"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GKSU_LIBS" >&5 +$as_echo "$GKSU_LIBS" >&6; } + GKSU_REQUIRED_VERSION=2.0 -$as_echo "#define HAVE_WNCK 1" >>confdefs.h - WNCK_FOUND="yes" - elif $PKG_CONFIG --exists "libwnck-1.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libwnck-1.0"` + +$as_echo "#define HAVE_GKSU 1" >>confdefs.h + + GKSU_FOUND="yes" + + elif $PKG_CONFIG --exists "libgksu2" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libgksu2"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package libwnck-1.0 was found on your system," + echo "*** The required package libgksu2 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libwnck-1.0 to atleast version 2.0, or adjust" + echo "*** Please upgrade libgksu2 to atleast version 2.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -12809,8 +14078,8 @@ $as_echo "not found" >&6; } - echo "*** The required package libwnck-1.0 was not found on your system." - echo "*** Please install libwnck-1.0 (atleast version 2.0) or adjust" + echo "*** The required package libgksu2 was not found on your system." + echo "*** Please install libgksu2 (atleast version 2.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -12819,33 +14088,33 @@ fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libwnck-1.0 >= 2.0" >&5 -$as_echo_n "checking for optional package libwnck-1.0 >= 2.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libgksu2 >= 2.0" >&5 +$as_echo_n "checking for optional package libgksu2 >= 2.0... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libwnck-1.0" >&5 -$as_echo_n "checking for optional package libwnck-1.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libgksu2" >&5 +$as_echo_n "checking for optional package libgksu2... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 $as_echo "disabled" >&6; } fi - if test x"$WNCK_FOUND" = x"yes"; then - HAVE_WNCK_TRUE= - HAVE_WNCK_FALSE='#' + if test x"$GKSU_FOUND" = x"yes"; then + HAVE_GKSU_TRUE= + HAVE_GKSU_FALSE='#' else - HAVE_WNCK_TRUE='#' - HAVE_WNCK_FALSE= + HAVE_GKSU_TRUE='#' + HAVE_GKSU_FALSE= fi - if test x"$WNCK_FOUND" = x"yes"; then - HAVE_WNCK_TRUE= - HAVE_WNCK_FALSE='#' + if test x"$GKSU_FOUND" = x"yes"; then + HAVE_GKSU_TRUE= + HAVE_GKSU_FALSE='#' else - HAVE_WNCK_TRUE='#' - HAVE_WNCK_FALSE= + HAVE_GKSU_TRUE='#' + HAVE_GKSU_FALSE= fi @@ -12866,7 +14135,7 @@ ac_os_implementation="freebsd" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_openfiles in -lkvm" >&5 $as_echo_n "checking for kvm_openfiles in -lkvm... " >&6; } -if test "${ac_cv_lib_kvm_kvm_openfiles+set}" = set; then : +if ${ac_cv_lib_kvm_kvm_openfiles+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12900,7 +14169,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_openfiles" >&5 $as_echo "$ac_cv_lib_kvm_kvm_openfiles" >&6; } -if test "x$ac_cv_lib_kvm_kvm_openfiles" = x""yes; then : +if test "x$ac_cv_lib_kvm_kvm_openfiles" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBKVM 1 _ACEOF @@ -12914,8 +14183,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -12932,8 +14200,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -12947,7 +14214,7 @@ ac_os_implementation="solaris" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 $as_echo_n "checking for kstat_open in -lkstat... " >&6; } -if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then : +if ${ac_cv_lib_kstat_kstat_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12981,7 +14248,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5 $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } -if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then : +if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBKSTAT 1 _ACEOF @@ -12995,8 +14262,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -13013,8 +14279,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -13027,7 +14292,7 @@ *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OS implementation" >&5 $as_echo_n "checking for OS implementation... " >&6; } - as_fn_error "no OS implementation for $target_os is available" "$LINENO" 5 + as_fn_error $? "no OS implementation for $target_os is available" "$LINENO" 5 ;; esac fi @@ -13098,19 +14363,26 @@ -Wno-missing-field-initializers \ -Wno-unused-parameter -Wold-style-definition \ -Wdeclaration-after-statement \ - -Wmissing-declarations -Wredundant-decls \ + -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs \ - -fstack-protector" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" + + if test x`uname` = x"Linux"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + fi + + if test x`uname` != x"OpenBSD"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" + fi if test x"$enable_debug" = x"full"; then $as_echo "#define DEBUG_TRACE 1" >>confdefs.h - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" { $as_echo "$as_me:${as_lineno-$LINENO}: result: full" >&5 $as_echo "full" >&6; } @@ -13156,7 +14428,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else @@ -13232,10 +14504,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -13265,6 +14548,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -13274,15 +14565,15 @@ fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13290,35 +14581,43 @@ if test -z "${HAVE_WNCK_TRUE}" && test -z "${HAVE_WNCK_FALSE}"; then - as_fn_error "conditional \"HAVE_WNCK\" was never defined. + as_fn_error $? "conditional \"HAVE_WNCK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_WNCK_TRUE}" && test -z "${HAVE_WNCK_FALSE}"; then - as_fn_error "conditional \"HAVE_WNCK\" was never defined. + as_fn_error $? "conditional \"HAVE_WNCK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GKSU_TRUE}" && test -z "${HAVE_GKSU_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GKSU\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GKSU_TRUE}" && test -z "${HAVE_GKSU_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GKSU\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OS_FREEBSD_TRUE}" && test -z "${OS_FREEBSD_FALSE}"; then - as_fn_error "conditional \"OS_FREEBSD\" was never defined. + as_fn_error $? "conditional \"OS_FREEBSD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OS_BSD_TRUE}" && test -z "${OS_BSD_FALSE}"; then - as_fn_error "conditional \"OS_BSD\" was never defined. + as_fn_error $? "conditional \"OS_BSD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OS_SOLARIS_TRUE}" && test -z "${OS_SOLARIS_FALSE}"; then - as_fn_error "conditional \"OS_SOLARIS\" was never defined. + as_fn_error $? "conditional \"OS_SOLARIS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then - as_fn_error "conditional \"OS_LINUX\" was never defined. + as_fn_error $? "conditional \"OS_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OS_SKEL_TRUE}" && test -z "${OS_SKEL_FALSE}"; then - as_fn_error "conditional \"OS_SKEL\" was never defined. + as_fn_error $? "conditional \"OS_SKEL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -13419,6 +14718,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13464,19 +14764,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -13614,16 +14914,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -13672,7 +14972,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -13683,28 +14983,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -13725,8 +15013,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xfce4 Taskmanager $as_me 1.0.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by Xfce4 Taskmanager $as_me 1.0.1, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13792,11 +15080,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xfce4 Taskmanager config.status 1.0.0 -configured by $0, generated by GNU Autoconf 2.65, +Xfce4 Taskmanager config.status 1.0.1 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13814,11 +15102,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -13840,6 +15133,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -13852,7 +15146,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -13861,7 +15155,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -13881,7 +15175,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -13929,6 +15223,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"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -13943,13 +15238,20 @@ lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' @@ -13964,14 +15266,17 @@ 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_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"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $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"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' @@ -13995,7 +15300,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -14004,12 +15308,12 @@ hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -14056,6 +15360,7 @@ SHELL \ ECHO \ LD \ +PATH_SEPARATOR \ NM \ LN_S \ lt_SP2NL \ @@ -14064,8 +15369,13 @@ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -14075,12 +15385,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -14094,9 +15406,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -14132,6 +15442,7 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ @@ -14185,7 +15496,7 @@ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -14208,9 +15519,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -14218,12 +15530,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -14240,12 +15553,12 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -14254,18 +15567,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14273,7 +15586,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -14321,7 +15634,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -14353,21 +15666,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -14379,7 +15700,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -14391,11 +15712,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14480,7 +15801,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -14493,7 +15814,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -14512,7 +15833,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -14521,7 +15842,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -14547,8 +15868,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -14684,23 +16005,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -14709,21 +16031,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -14769,7 +16091,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -14782,7 +16104,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -14816,21 +16138,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -14884,8 +16204,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -14954,6 +16274,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -14988,19 +16311,42 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -15030,6 +16376,12 @@ # 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 +# 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. +lt_sysroot=$lt_sysroot + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -15039,6 +16391,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -15153,12 +16508,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -15208,10 +16563,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -15245,9 +16596,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -15263,6 +16611,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -15295,210 +16646,169 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# 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 -# to NONDIR_REPLACEMENT. -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# 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_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}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# 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 () -{ - # Extract subdirectory from the argument. - 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_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - - -# 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 -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + 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 - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -15508,7 +16818,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -15536,7 +16846,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -15557,7 +16867,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 @@ -15568,8 +16878,11 @@ echo echo "Build Configuration:" echo -echo "* Wnck: ${WNCK_FOUND:-no} ${WNCK_VERSION:+(libwnck $WNCK_VERSION)}" +echo "* Gksu: ${GKSU_VERSION:-no}" +echo "* Wnck: ${WNCK_VERSION:-no}" +echo "* Cairo: ${CAIRO_VERSION}" +echo "* GTK+: ${GTK_VERSION}" echo "* Target OS: $target_os ($ac_os_implementation)" -echo "* Debug Support: $enable_debug" +echo "* Debug: $enable_debug" echo diff -Nru xfce4-taskmanager-1.0.0/configure.ac xfce4-taskmanager-1.0.1/configure.ac --- xfce4-taskmanager-1.0.0/configure.ac 2010-06-14 11:02:03.000000000 +0000 +++ xfce4-taskmanager-1.0.1/configure.ac 2014-01-08 18:42:02.000000000 +0000 @@ -14,8 +14,8 @@ dnl *************************** m4_define([taskmanager_version_major], [1]) m4_define([taskmanager_version_minor], [0]) -m4_define([taskmanager_version_micro], [0]) -m4_define([taskmanager_version_build], [e96703c]) +m4_define([taskmanager_version_micro], [1]) +m4_define([taskmanager_version_build], [b8e8789]) m4_define([taskmanager_version_tag], []) m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [git], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])]) @@ -33,7 +33,7 @@ dnl *************************** dnl *** Initialize automake *** dnl *************************** -AM_INIT_AUTOMAKE([1.8 dist-bzip2]) +AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -63,7 +63,7 @@ dnl ****************************** dnl *** Check for i18n support *** dnl ****************************** -XDT_I18N([ar ast be ca cs da de el en_GB es eu fi fr gl hr hu id it ja kk lv nb nl pa pl pt pt_BR ru si sk sq sv tr ug uk ur ur_PK vi zh_CN zh_TW ]) +XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl oc pa pl pt pt_BR ru si sk sl sq sr sv te tr ug uk ur ur_PK vi zh_CN zh_HK zh_TW ]) dnl *********************************** dnl *** Check for required packages *** @@ -71,11 +71,13 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0]) XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.5.0]) -dnl ****************************************** -dnl *** Check for optional package libwnck *** -dnl ****************************************** +dnl *********************************** +dnl *** Check for optional packages *** +dnl *********************************** XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-1.0], [2.0], [wnck], [building with libwnck for window icons/names], [yes]) AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"]) +XDT_CHECK_OPTIONAL_PACKAGE([GKSU], [libgksu2], [2.0], [gksu], [building with libgksu to run as root], [yes]) +AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"]) dnl *********************************** dnl ********** Check for skel ********* @@ -149,8 +151,11 @@ echo echo "Build Configuration:" echo -echo "* Wnck: ${WNCK_FOUND:-no} ${WNCK_VERSION:+(libwnck $WNCK_VERSION)}" +echo "* Gksu: ${GKSU_VERSION:-no}" +echo "* Wnck: ${WNCK_VERSION:-no}" +echo "* Cairo: ${CAIRO_VERSION}" +echo "* GTK+: ${GTK_VERSION}" echo "* Target OS: $target_os ($ac_os_implementation)" -echo "* Debug Support: $enable_debug" +echo "* Debug: $enable_debug" echo diff -Nru xfce4-taskmanager-1.0.0/debian/changelog xfce4-taskmanager-1.0.1/debian/changelog --- xfce4-taskmanager-1.0.0/debian/changelog 2013-10-09 20:49:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/debian/changelog 2014-01-09 08:12:52.000000000 +0000 @@ -1,3 +1,11 @@ +xfce4-taskmanager (1.0.1-1) unstable; urgency=medium + + [ Jackson Doak ] + * New upstream release + * debian/control: Bump standards-version to 3.9.5 + + -- Yves-Alexis Perez Thu, 09 Jan 2014 09:12:50 +0100 + xfce4-taskmanager (1.0.0-4) unstable; urgency=low [ Jackson Doak ] diff -Nru xfce4-taskmanager-1.0.0/debian/control xfce4-taskmanager-1.0.1/debian/control --- xfce4-taskmanager-1.0.0/debian/control 2013-09-20 20:35:57.000000000 +0000 +++ xfce4-taskmanager-1.0.1/debian/control 2014-01-08 19:26:15.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.12.0), libcairo2-dev (>= 1.5.0), libwnck-dev (>= 2.0), intltool, dh-autoreconf, xfce4-dev-tools, libkvm-dev [kfreebsd-any] -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://goodies.xfce.org/projects/applications/xfce4-taskmanager Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-taskmanager/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-taskmanager/ diff -Nru xfce4-taskmanager-1.0.0/debian/patches/01_configure-kfreebsd.patch xfce4-taskmanager-1.0.1/debian/patches/01_configure-kfreebsd.patch --- xfce4-taskmanager-1.0.0/debian/patches/01_configure-kfreebsd.patch 2013-09-18 09:15:33.000000000 +0000 +++ xfce4-taskmanager-1.0.1/debian/patches/01_configure-kfreebsd.patch 2014-01-08 19:25:20.000000000 +0000 @@ -11,9 +11,14 @@ Last-Update: 2013-9-14 Forwarded: no +--- + configure.ac | 2 +- + src/task-manager-freebsd.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + --- a/configure.ac +++ b/configure.ac -@@ -92,7 +92,7 @@ +@@ -94,7 +94,7 @@ if test x"$ac_skel" = x"yes"; then ac_os_implementation="skel" else case "$target_os" in @@ -32,7 +37,7 @@ #include -@@ -104,6 +105,7 @@ +@@ -104,6 +105,7 @@ get_task_details (kvm_t *kd, struct kinf struct passwd *pw; char **argv; int i; @@ -40,7 +45,7 @@ task->pid = kp->ki_pid; task->ppid = kp->ki_ppid; -@@ -168,9 +170,9 @@ +@@ -168,9 +170,9 @@ get_task_details (kvm_t *kd, struct kinf i++; if (!(kp->ki_sflag & PS_INMEM)) task->state[i++] = 'W'; diff -Nru xfce4-taskmanager-1.0.0/depcomp xfce4-taskmanager-1.0.1/depcomp --- xfce4-taskmanager-1.0.0/depcomp 2010-06-14 11:02:24.000000000 +0000 +++ xfce4-taskmanager-1.0.1/depcomp 2014-01-08 18:42:04.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru xfce4-taskmanager-1.0.0/install-sh xfce4-taskmanager-1.0.1/install-sh --- xfce4-taskmanager-1.0.0/install-sh 2010-06-14 11:02:23.000000000 +0000 +++ xfce4-taskmanager-1.0.1/install-sh 2014-01-08 18:42:04.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -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;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ 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-writeable bit of parent directory when it shouldn't. + # 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 @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru xfce4-taskmanager-1.0.0/ltmain.sh xfce4-taskmanager-1.0.1/ltmain.sh --- xfce4-taskmanager-1.0.0/ltmain.sh 2010-06-14 11:02:05.000000000 +0000 +++ xfce4-taskmanager-1.0.1/ltmain.sh 2014-01-08 18:42:02.000000000 +0000 @@ -1,10 +1,9 @@ -# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.2.8 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 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. @@ -42,6 +41,7 @@ # --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 @@ -70,17 +70,19 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.8 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.8 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3169 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -124,10 +126,6 @@ $lt_unset CDPATH - - - - # 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 @@ -139,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -167,6 +160,27 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," +# 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 # call: @@ -181,17 +195,31 @@ # 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}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$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}" + else + func_dirname_result="$func_dirname_result${2}" + 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 -# Generated shell functions inserted here. # These SED scripts presuppose an absolute path with a trailing slash. pathcar='s,^/\([^/]*\).*$,\1,' @@ -355,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -374,6 +402,15 @@ # 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. @@ -402,7 +439,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -428,14 +465,14 @@ # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $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${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -654,17 +691,35 @@ 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# // + s/\n# / / b more } :go @@ -681,6 +736,8 @@ # Echo short help message to standard output and exit. func_usage () { + $opt_debug + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// @@ -697,7 +754,10 @@ # unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -707,10 +767,14 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" ret=$? if test -z "$1"; then exit $ret @@ -722,12 +786,39 @@ # exit_cmd. func_missing_arg () { + $opt_debug + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# 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=: @@ -737,25 +828,64 @@ magic_exe="%%%MAGIC EXE variable%%%" # Global variables. -# $mode is unset nonopt= -execute_dlfiles= preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" extracted_archives= extracted_serial=0 -opt_dry_run=false -opt_duplicate_deps=false -opt_silent=false -opt_debug=: - # 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... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -845,129 +975,209 @@ esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# 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 +$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 +$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 +$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 - # 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 + exit $EXIT_MISMATCH + fi +} - # Parse non-mode specific arguments: - while test "$#" -gt 0; do + +# 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 - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - 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 $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: - opt_verbose=false + opt_preserve_dup_deps=: ;; - - --no-quiet|--no-silent) - preserve_args="$preserve_args $opt" - opt_silent=false + --features) + opt_features=: +func_features ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --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 - opt_verbose=: +func_append preserve_args " $opt" ;; - - --no-verbose) preserve_args="$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" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --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: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --help-all) opt_help=': help-all' ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # 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 ;; 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*) @@ -975,82 +1185,44 @@ opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# 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 -$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 -$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 -$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 + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} - + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" -## ----------- ## -## Main. ## -## ----------- ## - -$opt_help || { - # Sanity checks first: - func_check_version_match + # 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 - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$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=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1115,12 +1287,9 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + 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_p file @@ -1166,6 +1335,37 @@ } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1178,8 +1378,7 @@ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1198,8 +1397,7 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1230,43 +1428,523 @@ } - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# 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}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + 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"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + 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 -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" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # 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"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + 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. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# 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. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + 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" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + 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. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# 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" + 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" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + 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" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + 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" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# 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. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + 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}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + 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 ';.'; + # and winepath ignores them completely. + 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_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi + $opt_debug + 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_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - $opt_dry_run || { - cat >${write_libobj}T < "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1520,7 +2195,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1567,11 +2242,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1616,13 +2291,13 @@ } $opt_help || { - test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1798,7 +2473,7 @@ ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac @@ -1813,13 +2488,13 @@ else { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done } | sed -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do echo func_mode_help done @@ -1848,13 +2523,16 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # 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" @@ -1876,7 +2554,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1933,8 +2611,7 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1966,22 +2643,59 @@ fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + 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 \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -1991,7 +2705,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -2000,53 +2714,55 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - 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 "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 " during execution" - fi - if test -n "$runpath_var"; then - 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\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + 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 "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 " during execution" + fi + if test -n "$runpath_var"; then + 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" - 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'" - fi - echo + $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'" + fi + echo - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2071,7 +2787,7 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -2091,7 +2807,7 @@ do arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -2129,11 +2845,11 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" if test -n "$arg2"; then func_quote_for_eval "$arg2" fi - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2145,7 +2861,7 @@ if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else func_quote_for_eval "$install_override_mode" - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -2203,10 +2919,13 @@ case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # 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" @@ -2220,19 +2939,19 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. @@ -2309,7 +3028,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2483,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2506,7 +3227,7 @@ fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2553,6 +3274,18 @@ #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 + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#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 + /* External symbol declarations for the compiler. */\ " @@ -2564,8 +3297,9 @@ # Add our own program objects to the symbol list. progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + 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 if test -n "$exclude_expsyms"; then @@ -2614,10 +3348,52 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + 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="" + 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 + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2655,26 +3431,9 @@ const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - echo >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - echo >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2714,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2730,7 +3489,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2793,7 +3552,8 @@ # 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 - win32_nmres=`eval $NM -f posix -A $1 | + 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 /{ @@ -2822,6 +3582,131 @@ $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./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 + # 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 + # begins with a literal '.' or a single character followed by + # a '.'. + # + # 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 +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + 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 + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -3100,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -3200,6 +4088,18 @@ if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -3214,14 +4114,6 @@ " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. @@ -3239,166 +4131,6 @@ } -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_result=`cygpath -w "$1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result= - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path - -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_pathlist_tmp1=$func_stripname_result - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - func_to_host_pathlist_result=` - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_append func_to_host_pathlist_result ";$func_to_host_path_result" - fi - fi - fi - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result"; then - func_error "Could not determine the host path(s) corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_append func_to_host_pathlist_result ";" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist - # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout # Must ONLY be called from within func_mode_link because @@ -3568,14 +4300,14 @@ EOF cat </dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -7004,7 +7827,7 @@ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7029,7 +7852,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7045,7 +7868,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -7058,7 +7881,7 @@ 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 - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7083,7 +7906,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7187,7 +8010,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7197,10 +8020,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -7212,15 +8035,22 @@ # 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. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && 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" else @@ -7229,18 +8059,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -7248,17 +8078,13 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -7266,7 +8092,7 @@ fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -7292,7 +8118,7 @@ linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic @@ -7303,7 +8129,7 @@ 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" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7334,13 +8160,45 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # 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 + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + 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" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7374,7 +8232,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7384,7 +8242,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7404,21 +8262,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7480,10 +8338,13 @@ echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done echo ')' >> $output - delfiles="$delfiles $output" + 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 func_verbose "creating linker input file list: $output" @@ -7497,10 +8358,12 @@ fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7551,7 +8414,7 @@ if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7585,7 +8448,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7618,7 +8481,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7659,10 +8522,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7678,7 +8541,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7690,7 +8553,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; 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 @@ -7774,13 +8637,16 @@ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && 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 @@ -7854,8 +8720,8 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi @@ -7875,7 +8741,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7885,17 +8751,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7903,7 +8769,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7922,18 +8788,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7942,12 +8808,12 @@ case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -7973,18 +8839,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -8035,6 +8901,12 @@ exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8057,7 +8929,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8065,7 +8937,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8080,6 +8952,13 @@ $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -8113,6 +8992,12 @@ func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -8210,7 +9095,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -8218,10 +9103,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -8232,10 +9117,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -8253,7 +9138,7 @@ else echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -8277,18 +9162,30 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8382,12 +9279,23 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + 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" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8401,9 +9309,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8420,7 +9328,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8432,7 +9340,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8441,7 +9349,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi @@ -8526,7 +9434,7 @@ exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8546,9 +9454,9 @@ for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8557,24 +9465,23 @@ rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8600,18 +9507,17 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8639,19 +9545,19 @@ # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + 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 - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8661,7 +9567,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8670,7 +9576,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8678,12 +9584,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8691,7 +9597,6 @@ esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8703,16 +9608,16 @@ exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff -Nru xfce4-taskmanager-1.0.0/missing xfce4-taskmanager-1.0.1/missing --- xfce4-taskmanager-1.0.0/missing 2010-06-14 11:02:23.000000000 +0000 +++ xfce4-taskmanager-1.0.1/missing 2014-01-08 18:42:04.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru xfce4-taskmanager-1.0.0/mkinstalldirs xfce4-taskmanager-1.0.1/mkinstalldirs --- xfce4-taskmanager-1.0.0/mkinstalldirs 2010-06-14 11:02:24.000000000 +0000 +++ xfce4-taskmanager-1.0.1/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# 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 -Nru xfce4-taskmanager-1.0.0/po/Makefile.in.in xfce4-taskmanager-1.0.1/po/Makefile.in.in --- xfce4-taskmanager-1.0.0/po/Makefile.in.in 2010-06-14 11:02:05.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/Makefile.in.in 2014-01-08 18:42:02.000000000 +0000 @@ -50,8 +50,8 @@ XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS) INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -74,15 +74,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru xfce4-taskmanager-1.0.0/po/POTFILES.in xfce4-taskmanager-1.0.1/po/POTFILES.in --- xfce4-taskmanager-1.0.0/po/POTFILES.in 2010-06-13 15:56:07.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/POTFILES.in 2014-01-08 18:42:02.000000000 +0000 @@ -1,10 +1,14 @@ xfce4-taskmanager.desktop.in src/app-manager.c +src/exec-tool-button.c src/main.c src/process-monitor.c src/process-statusbar.c src/process-tree-view.c src/process-window.c -src/process-window.ui +[type: gettext/glade]src/process-window.ui src/settings.c +src/settings-dialog.c +[type: gettext/glade]src/settings-dialog.ui +src/settings-tool-button.c src/task-manager.c diff -Nru xfce4-taskmanager-1.0.0/po/ar.po xfce4-taskmanager-1.0.1/po/ar.po --- xfce4-taskmanager-1.0.0/po/ar.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/ar.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,211 +1,359 @@ +# mohammad , 2012. +# محمد الحرقان , 2012. msgid "" msgstr "" -"Project-Id-Version: xfce\n" +"Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" -"PO-Revision-Date: 2008-07-31 00:58+0200\n" -"Last-Translator: Mohamed Magdy \n" -"Language-Team: Arabeyes \n" +"POT-Creation-Date: 2012-11-09 21:45+0000\n" +"PO-Revision-Date: 2012-11-10 06:03+0300\n" +"Last-Translator: محمد الحرقان \n" +"Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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 ? 4 : 5;\n" +"X-Generator: Virtaal 0.7.1\n" "X-Poedit-Language: Arabic\n" +"X-Poedit-Country: Morocco\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "" +msgstr "من السهل إستخدام مدير المهام" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "" +msgstr "مدير المهام" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "خطأ في التنفيذ" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "لا يمكن العثور على أي أمر إفتراضي للتشغيل." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "شغل مدير المهام كجذر" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "شغل البرنامج..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "الباحث عن التطبيقات" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "محاكي الطرفية" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"العمليات: %u\n" +"CPU: %.0f%%\n" +"ذاكرة: %.0f%%\n" +"ذاكرة الإبدال: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" msgstr "" +"العمليات: %u\n" +"CPU: %.0f%%\n" +"ذاكرة: %.0f%%\n" +"ذاكرة الإبدال: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "ذاكرة: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "ذاكرة الإبدال: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "العمليات: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "مهام" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" -msgstr "" +msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" -msgstr "" +msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" -msgstr "" +msgstr "الحالة" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" -msgstr "" +msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "" +msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "" +msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "" +msgstr "إنهاء المهام" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "" +msgstr "قتل المهمة" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "متأكد أنك تريد إرسال إشعار إلى PID %d؟" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "خطأ أتناء إرسال الإشعار" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "" "An error was encountered by sending a signal to the PID %d. It is likely you " "don't have the required privileges." -msgstr "" +msgstr "حدث خطأ أثناء إرسال الإشعار إلى PID %d. يبدو انك لا تملك صلاحيات كافية." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "خطأ في إعداد الأولويات" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " "you don't have the required privileges." -msgstr "" +msgstr "حدث خطأ أثناء إعداد الاولويات PID %d. يبدو انك لا تملك صلاحيات كافية." -#: ../src/process-tree-view.c:260 +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "" +msgstr "إنهاء" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" -msgstr "" +msgstr "إقاف" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" -msgstr "" +msgstr "إستمرار" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" -msgstr "" +msgstr "قتل" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "منخفض جدا" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "منخفض" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "عادي" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "مرتفع" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "مرتفع جدا" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" -msgstr "" - -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" +msgstr "أولوية" -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" - -#: ../src/process-window.c:228 -msgid "Terminal emulator" -msgstr "" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Karim Oulad Chalha محمد الحرقان" -#: ../src/process-window.c:229 -msgid "XTerm" -msgstr "" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "تحذير, أنت تستعمل حساب الجذر, يمكن أن تخرب نظامك." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "إفتراضي" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "صغير" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "كبير" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "نص" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "معلومات" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "نمط الواجهة" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "منوعات" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "أعمدة:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "رسم حدود حول شاشات" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "إخفاء في منطقة الإشعار" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "تعجيل إنهاء المهام" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "تجديد القيمة:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "إعدادات" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "إعدادات مدير المهام" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "عرض أيقونات التطبيق" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "عرض كامل سطور الأمر" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "عرض القيمة مع المزيد من الدقة" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "نمط شريط الأدوات:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1ثانية" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2 ثوان" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5 ثوان" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10 ثوان" -#: ../src/process-window.c:271 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "" +msgstr "عرض عل العمليات" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "تجديد القيمة" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "بايت الإفتراضي" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" - -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "Mohamed Magdy" +msgstr "بايت الخاص" -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 +#: ../src/task-manager.c:263 #, c-format -msgid "%.2f%%" -msgstr "" +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/be.po xfce4-taskmanager-1.0.1/po/be.po --- xfce4-taskmanager-1.0.0/po/be.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/be.po 2014-01-08 18:42:02.000000000 +0000 @@ -2,228 +2,362 @@ # 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: xfce4-taskmanager trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" +"POT-Creation-Date: 2012-05-04 15:21+0000\n" "PO-Revision-Date: 2008-11-08 00:00+0200\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: be\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Просты ў выкарыстаньні мэнаджэр працэсаў" +msgstr "Просты ў выкарыстаньні Кіраўнік Працэсаў" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Мэнаджэр працэсўа Xfce4" +msgstr "Кіраўнік Працэсаў" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Памылка запуска" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Не атрымліваецца адшукаць ніводнай прадвызначанай каманды каб выканаць." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Запусціць Кіраўнік працэсаў як root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Запусціць праграму…" + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Пошук праграм" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Эмулятар тэрміналу" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "" +"\t\r\n" +"\r\n" +"XTerm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" msgstr "" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" msgstr "" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Памяць: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" msgstr "" +"\t\r\n" +"\r\n" +"Swap: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Працэс: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Задача" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Стан" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "ЦП%" +msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 #, fuzzy msgid "Prio." msgstr "Prio" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Насамрэч завяршыць працэс?" +msgstr "Спыніць праграму" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Kill" +msgstr "Забіць задачу" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Вы сапраўды хочаце паслаць сігнал працэсу з ID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "Памылка дасылання сігнала" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "" "An error was encountered by sending a signal to the PID %d. It is likely you " "don't have the required privileges." -msgstr "" +msgstr "Памылка адбылася пад час дасылання сігнала працэсу з ID %d. Падобна што вы не маеце належных правоў у сістэме." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "Памылка прызначэння прыярытэту" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " "you don't have the required privileges." -msgstr "" +msgstr "Памылка адбылася пад час прызначэння прыярытэту працэсу з PID %d. Падобна на тое, што вы не маеце належных правоў у сістэме." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Term" +msgstr "Спыніць" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Stop" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Continue" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Kill" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Вельмі нізкі" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Нізкі" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Звычайны" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "Высокі" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Вельмі высокі" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Прыярытэт" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" - -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Аўтар:" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Alexander Nyakhaychyk , 2008" -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Term" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Увага, вы выкарыстоўваеце рахунак root'а і можаце пашкодзіць сітэму." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Па-змоўчванню" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Маленькі" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Вялікі" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Тэкст" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Інфармацыя" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Стыль інтэрфейса" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Рознае" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Слупкі:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Маляваць рамкі навокал манітораў" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Схаваць у зону паведамленняў" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Перапытваць наконт спынення праграм" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Частата абнаўлення:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Наладкі" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Наладкі Кіраўніка Працэсаў" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Паказваць значкі праграм" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Паказваць поўныя каманды" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Паказваць значэнні з большай дакладнасцю" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Стыль панэлі прыладаў:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500мс" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750мс" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1с" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2с" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5с" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10с" -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Кантроль над вашымі працэсамі" +msgstr "Паказаць усе працэсы" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Частата абнаўлення" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "Alexander Nyakhaychyk , 2008" - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu МіБ" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu КіБ" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu Б" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" +#~ msgid "%.2f%%" +#~ msgstr "%0.0f %%" #~ msgid "Control your processes" #~ msgstr "Кантроль над вашымі працэсамі" @@ -243,9 +377,6 @@ #~ msgid "Cpu usage" #~ msgstr "Выкарыстаньне ЦП" -#~ msgid "Memory usage" -#~ msgstr "Выкарыстаньне памяці" - #~ msgid "Command" #~ msgstr "Загад" diff -Nru xfce4-taskmanager-1.0.0/po/bg.po xfce4-taskmanager-1.0.1/po/bg.po --- xfce4-taskmanager-1.0.0/po/bg.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/bg.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,352 @@ +# 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 Tunev , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Apps\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-07-18 10:39+0000\n" +"Last-Translator: cybercop \n" +"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce/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" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Мениджър на задачи" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Лесен за използване мениджър на задачи" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Грешка при изпълнение" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Не беше намерена подразбираща се команда за изпълнение." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Стартиране на Мениджъра на задачи с администраторски права." + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Стартиране на Програма..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Търсене на програма" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Терминален емулатор" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XТерминал" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Процеси: %u\nПроцесор: %.0f%%\nПамет: %.0f%%\nВиртуална памет %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Процеси: %u\nПроцесор: %.0f%%\nПамет: %.0f%%\nВиртуална памет: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "Процесор: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Памет: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Виртуална памет: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "Процеси: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "Задача" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "Състояние" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "РВП" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "РПП" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "ЮИД" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "Процесор" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "Приор." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "Прекратяване на задача" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "Убиване на задачата" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "Сигурни ли сте, че искате да изпратите сигнал до PID %d?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "Грешка при пращане на сигнала" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Възникна грешка при пращането на сигнал до PID %d. Възможно е да нямате нужните права." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "Грешка при задаване на приоритет" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "Възникна грешка при определяне приоритет на PID %d. Има вероятност да не притежавате необходимите права." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Прекратяване" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "Спиране" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "Продължаване" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "Убиване" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "Много нисък" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "Нисък" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "Нормален" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "Висок" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "Много висок" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "Приоритет" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Kyril Kirilov (Cybercop) " + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Внимание, Вие използвате администраторски акаунт, което може да застраши вашата система." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "По подразбиране" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Малък" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Голям" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Текст" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Настройване на Мениджъра на задачи" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Показване на икони на програмите" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Показване на пълният команден ред" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Покажи стойностите с по- голяма точност" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Начертаване на рамка около екрана" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Стил на лентата с инструменти:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Стил на интерфейса" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Питай за прекратяване на задачите" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Скриване в зоната за уведомяване" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Разни" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Честота на опресняване:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Колони:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Информация" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Настройки" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500мс" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750мс" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1с" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2с" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5с" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10с" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "Покажи всички процеси" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Честота на опресняване" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "Виртуално пространство" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "Лично пространство" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu МБ" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu КБ" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu Б" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/ca.po xfce4-taskmanager-1.0.1/po/ca.po --- xfce4-taskmanager-1.0.0/po/ca.po 2010-05-25 22:01:14.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/ca.po 2014-01-08 18:42:02.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 10:09+0000\n" +"POT-Creation-Date: 2010-11-04 11:12+0000\n" "PO-Revision-Date: 2008-11-16 14:35+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" @@ -18,272 +18,351 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:392 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Gestor de tasques fàcil d'usar" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:387 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:389 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Gestor de processos" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Error d'execució" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "No s'ha pogut trobar una comanda per defecte per a executar." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Executar el Gestor de Tasques com a root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Executar el programa..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Buscador d'aplicacions" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulador de terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processos: %u\n" +"CPU: %.0f%%\n" +"Memòria: %.0f%%\n" +"Espai d'intercanvi: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processos: %u\n" +"CPU: %.0f%%\n" +"Memòria: %.0f%%\n" +"Espai d'intercanvi: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Memòria: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Espai d'intercanvi: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Processos: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Tasca" -#: ../src/process-tree-view.c:116 ../src/process-window.c:327 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:328 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:329 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Estat" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "Tamany virtual" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:332 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:333 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Finalitzar la tasca" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Matar la tasca (KILL)" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Esteu segur que voleu enviar un senyal al PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Error enviant el senyal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." msgstr "S'ha trobat un error a l'enviar un senyal al procés %d. Comproveu que teniu els privilegis necessaris." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:386 msgid "Error setting priority" msgstr "No s'ha pogut establir la prioritat" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:387 #, c-format msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." msgstr "S'ha trobat un error en canviar la prioritat del procés %d. Comproveu que teniu els privilegis necessaris." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:403 +msgid "Terminate" +msgstr "Acabar la tasca (TERM)" + +#: ../src/process-tree-view.c:410 msgid "Stop" msgstr "Atura (STOP)" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:417 msgid "Continue" msgstr "Continua (CONT)" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:423 msgid "Kill" msgstr "Mata (KILL)" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Acabar la tasca (TERM)" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:430 msgid "Very low" msgstr "Molt baixa" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:435 msgid "Low" msgstr "Baixa" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:440 msgid "Normal" msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:445 msgid "High" msgstr "Alta" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:450 msgid "Very high" msgstr "Molt alta" -#: ../src/process-tree-view.c:312 ../src/process-window.c:334 +#: ../src/process-tree-view.c:455 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioritat" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Error d'execució" - -#: ../src/process-window.c:214 ../src/process-window.c:216 -#: ../src/process-window.c:218 -msgid "Run Program..." -msgstr "Executar el programa..." - -#: ../src/process-window.c:221 -msgid "Application Finder" -msgstr "Buscador d'aplicacions" - -#: ../src/process-window.c:224 -msgid "Terminal emulator" -msgstr "Emulador de terminal" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Pau Ruŀlan Ferragut" -#: ../src/process-window.c:226 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Atenció!, esteu usant la conta de root, això podria malmetre el vostre sistema." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Defecte" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Petit" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Gran" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Text" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informació" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Estil d'interfície" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Miscel·lània" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Columnes:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Dibuixa marcs als monitors" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Ocultar a l'àrea de notificació" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Pregunta per a finalitzar tasques" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Freqüència de refresc:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Propietats" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Propietats per al gestor de tasques" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Mostrar icones de l'aplicació" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Mostra la línia de comandes completa" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Mostra els valors amb més precisió" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Estil de la barra d'eines:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:267 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:268 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500ms" -#: ../src/process-window.c:269 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750ms" -#: ../src/process-window.c:270 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1s" -#: ../src/process-window.c:271 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2s" -#: ../src/process-window.c:272 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5s" -#: ../src/process-window.c:273 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10s" -#: ../src/process-window.c:314 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Mostra tots els processos" -#: ../src/process-window.c:315 -msgid "More precision" -msgstr "Més precisió" - -#: ../src/process-window.c:316 -msgid "Full command line" -msgstr "Línia de comandes completa" - -#: ../src/process-window.c:317 -msgid "Show status icon" -msgstr "Mostra icona d'estat" - -#: ../src/process-window.c:320 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Freqüència de refresc" -#: ../src/process-window.c:330 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Bytes virtuals" -#: ../src/process-window.c:331 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Bytes privats" -#: ../src/process-window.c:395 -msgid "translator-credits" -msgstr "Pau Ruŀlan Ferragut" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processos: %u\n" -"CPU: %.0f%%\n" -"Memòria: %.0f%%\n" -"Espai d'intercanvi: %.0f%%" +#~ msgid "More precision" +#~ msgstr "Més precisió" -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processos: %u\n" -"CPU: %.0f%%\n" -"Memòria: %.0f%%\n" -"Espai d'intercanvi: %.0f%%" +#~ msgid "Show status icon" +#~ msgstr "Mostra icona d'estat" + +#~ msgid "250ms" +#~ msgstr "250ms" #~ msgid "Control your processes" #~ msgstr "Controla els processos" diff -Nru xfce4-taskmanager-1.0.0/po/cs.po xfce4-taskmanager-1.0.1/po/cs.po --- xfce4-taskmanager-1.0.0/po/cs.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/cs.po 2014-01-08 18:42:02.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: xfce4-taskmanager 0.4.0-rc2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" -"PO-Revision-Date: 2009-02-01 15:17+0100\n" +"POT-Creation-Date: 2010-12-06 23:12+0000\n" +"PO-Revision-Date: 2010-12-07 00:42+0100\n" "Last-Translator: Michal Várady \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,263 +16,387 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 +#: ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4-Taskmanager je snadno použitelný správce úloh" +msgstr "Snadno použitelný správce úloh" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 +#: ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 +#: ../src/main.c:156 +#: ../src/process-tree-view.c:355 +#: ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 +#: ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Správce úloh Xfce4" +msgstr "Správce úloh" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:87 +#: ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Chyba při spuštění" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Nelze najít výchozí příkaz pro spuštění." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Spustit Správce úloh jako root" + +#: ../src/exec-tool-button.c:175 +#: ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Spustit program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Vyhledávač aplikací" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulátor terminálu" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesy: %u\n" +"CPU: %.0f%%\n" +"Paměť: %.0f%%\n" +"Stránkovací soubor: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesy: %u\n" +"CPU: %.0f%%\n" +"Paměť: %.0f%%\n" +"Stránkovací soubor: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 +#: ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 +#: ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Paměť: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Stránkovací soubor: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Procesy: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Úloha" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 +#: ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 +#: ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 +#: ../src/settings-tool-button.c:176 msgid "State" msgstr "Stav" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 +#: ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 +#: ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio" +msgstr "Prio." -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Chcete opravdu ukončit tuto úlohu?" +msgstr "Ukončit úlohu" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Ukončit signálem KILL" +msgstr "Ukončit úlohu signálem KILL" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Opravdu chcete odeslat signál procesu s identifikátorem PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "Chyba pri odesílání signálu" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "Při odesílání signálu procesu s identifikátorem PID %d nastala chyba. Pravděpodobně nemáte potřebná oprávnění." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "Chyba při nastavování priority" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "Při nastavování priority procesu s identifikátorem PID %d nastala chyba. Pravděpodobně nemáte potřebná oprávnění." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Ukončit signálem TERM" +msgstr "Ukončit úlohu signálem TERM" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Zastavit" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Pokračovat" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Ukončit signálem KILL" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Velmi nízká" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Nízká" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Běžná" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "Vysoká" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Velmi vysoká" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 +#: ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Priorita" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Michal Várady " -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Původní autor:" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Varování: Používáte-li účet root, můžete poškodit systém." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Výchozí" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Malý" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Velký" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Text" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informace" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Styl rozhraní" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Ostatní" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Sloupce:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Vykreslovat okraje kolem monitorů" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Skrýt do oznamovací oblasti" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Ptát se na ukončování úloh" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Obnovovací frekvence:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Nastavení" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Nastavení Správce úloh" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Zobrazovat ikony aplikací" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Zobrazovat celé řádky příkazů" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Zobrazovat hodnoty s větší přesností" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Styl panelu nástrojů:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500 ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750 ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1 s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2 s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5 s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10 s" -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Ukončit signálem TERM" - -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Ovládejte své procesy" +msgstr "Zobrazit všechny procesy" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Onnovovací frekvence" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Virtuální bajty" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" +msgstr "Privátní bajty" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "Michal Várady " - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" #~ msgid "Control your processes" #~ msgstr "Ovládejte své procesy" - #~ msgid "Process manager" #~ msgstr "Správce procesů" - #~ msgid "Xfce4 Taskmanager" #~ msgstr "Správce úloh Xfce4" - #~ msgid "Really kill the task?" #~ msgstr "Chcete opravdu vynutit ukončení této úlohy?" - #~ msgid "%d MB of %d MB used" #~ msgstr "Využito %d MB z %d MB" - #~ msgid "Cpu usage" #~ msgstr "Využití procesoru" - -#~ msgid "Memory usage" -#~ msgstr "Využití paměti" - #~ msgid "Command" #~ msgstr "Příkaz" - #~ msgid "VM-Size" #~ msgstr "Velikost virtuální paměti" - #~ msgid "User" #~ msgstr "Uživatel" - #~ msgid "Show user tasks" #~ msgstr "Zobrazit úlohy uživatele" - #~ msgid "Show root tasks" #~ msgstr "Zobrazit úlohy uživatele root" - #~ msgid "Show other tasks" #~ msgstr "Zobrazit jiné úlohy" - #~ msgid "Show memory used by cache as free" #~ msgstr "Zobrazit paměť použitou pro cache jako volnou" - #~ msgid "Contributors:" #~ msgstr "Přispěvatelé:" - #~ msgid "xfce4-taskmanager" #~ msgstr "xfce4-taskmanager" - #~ msgid "more details" #~ msgstr "více podrobností" + diff -Nru xfce4-taskmanager-1.0.0/po/da.po xfce4-taskmanager-1.0.1/po/da.po --- xfce4-taskmanager-1.0.0/po/da.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/da.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,332 +1,352 @@ -# translation of xfce4-taskmanager to Danish -# Copyright (C) 2007 THE xfce4-taskmanager'S COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce4-taskmanager package. -# Jens Hyllegaard , 2007. -# Per Kongstad , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Aputsiaĸ Niels Janussen , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-taskmanager 0.4.0\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 11:30+0000\n" -"PO-Revision-Date: 2008-09-30 12:32+0100\n" -"Last-Translator: Per Kongstad \n" -"Language-Team: Danish \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-12-10 02:59+0000\n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" +"Language-Team: Danish (http://www.transifex.com/projects/p/xfce/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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Opgavehåndtering" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "En nem opgavehåndtering" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 -msgid "Task Manager" -msgstr "Opgaverhåndtering" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Fejl under udførsel" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Fandt ingen standardkommando som skulle køres." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Kør opgavehåndteringen som root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Kør program ..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Programsøger" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminal-emulator" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processer: %u\nCPU: %.0f%%\nHukommelse: %.0f%%\nSwap: %.0f%%" -#: ../src/process-statusbar.c:139 +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processer: %u\nCPU: %.0f%%\nHukommelse: %.0f%%\nSwap: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Hukommelse: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Swap: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "Proces: %d" +msgstr "Processer: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Opgave" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Tilstand" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Afbryd opgave" +msgstr "Afslut opgave" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Dræb opgave" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "Er du sikker på, at du vil sende et signal til PID'en %d?" +msgstr "Er du sikker på, at du vil sende et signal til PID'et %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "Fejl ved afsendelse af signal" +msgstr "Fejl ved signalafsendelse" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." -msgstr "En fejl opstod ved afsendelse af signal til PID'en %d. Det skyldes sandsynligvis manglende rettigheder." +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Stødte på en fejl under afsendelse af signal til PID'et %d. Du har sandsynligvis ikke de påkrævede privilegier." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "Fejl ved indstilling af prioritetet" +msgstr "Fejl ved angivelse af prioritet" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." -msgstr "En fejl opstod ved indstilling af PID'en %d.Det skyldes sandsynligvis manglende rettigheder." +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "Stødte på en fejl under angivelse af prioritet for PID'et %d. Du har sandsynligvis ikke de påkrævede privilegier." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Afslut" -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Stop" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Fortsæt" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Dræb" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Terminér" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Meget lav" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Lav" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Høj" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Meget høj" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioritet" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Fejl under udførsel" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Kør årogram..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Programfinder" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Terminalemulering" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Per Kongstad, Aputsiaq Niels Janussen\n\nDansk-gruppen \nMere info: http://www.dansk-gruppen.dk" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "Xterm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Advarsel, du anvender root-kontoen - du kan beskadige dit system." + +#: ../src/settings.c:378 +msgid "Default" +msgstr " Standard" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Lille" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Stor" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Tekst" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Indstillinger for opgavehåndteringen" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Vis programikoner" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Vis fulde kommandolinjer" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Vis værdier med større præcision" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Tegn kanter rundt om skærme" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Stil for værktøjslinje" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Stil for grænseflade" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Spørg ved lukning af opgaver" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Skjul i statusfeltet" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Diverse" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Opdateringsfrekvens:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Kolonner:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Information" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Indstillinger" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250 ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" -msgstr "500 ms" +msgstr "500ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" -msgstr "750 ms" +msgstr "750ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" -msgstr "1 s" +msgstr "1s" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" -msgstr "2 s" +msgstr "2s" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" -msgstr "5 s" +msgstr "5s" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" -msgstr "10 s" +msgstr "10s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Vis alle processer" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Større nøjagtighed" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Fuld kommandolinje" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Vis statusikon" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" -msgstr "Hvor ofte opdateres" +msgstr "Opdateringsfrekvens" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "Virtuelle bit" +msgstr "Virtuelle bytes" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "Private bit" +msgstr "Private bytes" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "" -"Jens Hyllegaard\n" -"Per Kongstad\n" -"\n" -"Dansk-gruppen \n" -"Mere info: http://www.dansk-gruppen.dk" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processer: %u\n" -"CPU: %.0f%%\n" -"Hukommelse: %.0f%%\n" -"Swap: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processer: %u\n" -"CPU: %.0f%%\n" -"Hukommelse: %.0f%%\n" -"Swap: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "Kontrollér dine processer" - -#~ msgid "Process manager" -#~ msgstr "Proceshåndtering" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Xfce4-proceshåndtering" - -#~ msgid "Really kill the task?" -#~ msgstr "Vil du virkelig dræbe processen?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "%d MB af %d MB brugt" - -#~ msgid "Cpu usage" -#~ msgstr "CPU-forbrug" - -#~ msgid "Memory usage" -#~ msgstr "Hukommelsesforbrug" - -#~ msgid "Command" -#~ msgstr "Kommando" - -#~ msgid "VM-Size" -#~ msgstr "VM-størrelse" - -#~ msgid "User" -#~ msgstr "Bruger" - -#~ msgid "Show user tasks" -#~ msgstr "Vis brugerprocesser" - -#~ msgid "Show root tasks" -#~ msgstr "Vis rootprocesser" - -#~ msgid "Show other tasks" -#~ msgstr "Vis andre processer" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Vis hukommelse der bruges af mellemlager som ledig" - -#~ msgid "Contributors:" -#~ msgstr "Bidragydere:" diff -Nru xfce4-taskmanager-1.0.0/po/de.po xfce4-taskmanager-1.0.1/po/de.po --- xfce4-taskmanager-1.0.0/po/de.po 2010-06-09 17:18:43.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/de.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,359 +1,352 @@ -# German translations for xfce4-taskmanager package. -# Copyright (C) 2005 Johannes Zellner. -# This file is distributed under the same license as the -# xfce4-taskmanager package. -# Johannes Zellner , 2005. -# Enrico Tröger , 2006, 2008. -# Fabian Nowak , 2007, 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# gem , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-09 16:09+0000\n" -"PO-Revision-Date: 2008-07-31 01:00+0200\n" -"Last-Translator: Fabian Nowak \n" -"Language-Team: German \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-09-19 09:12+0000\n" +"Last-Translator: gem \n" +"Language-Team: German (http://www.transifex.com/projects/p/xfce/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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:403 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Taskmanager" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4-Taskmanager ist ein einfach benutzbarer Taskmanager" +msgstr "Taskmanager mit einfacher Bedienung" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:336 -#: ../src/process-tree-view.c:351 ../src/process-tree-view.c:370 -#: ../src/process-window.c:185 ../src/process-window.c:398 ../src/main.c:119 -#, fuzzy -msgid "Task Manager" -msgstr "Xfce4 Taskmanager" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Fehler beim Ausführen" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Es wurde kein Standardbefehl gefunden." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Taskmanager mit Administratorrechten starten" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Befehl ausführen..." -#: ../src/process-statusbar.c:148 -#, fuzzy, c-format +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Anwendungsfinder" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminal-Emulator" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Prozesse: %u⏎\nCPU: %.0f%%⏎\nArbeitsspeicher: %.0f%%⏎\nAuslagerungsspeicher: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Prozesse: %u⏎\nCPU: %.0f%%⏎\nArbeitsspeicher: %.0f%%⏎\nAuslagerungsspeicher: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format msgid "CPU: %s%%" -msgstr "CPU: %.2f%%" +msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:157 -#, fuzzy, c-format +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format msgid "Memory: %s%%" -msgstr "Speicher: %.2f%%" +msgstr "Arbeitsspeicher: %s%%" #: ../src/process-statusbar.c:166 -#, fuzzy, c-format +#, c-format msgid "Swap: %s%%" -msgstr "Auslagerungsspeicher: %.2f%%" +msgstr "Auslagerungsspeicher: %s%%" #: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Prozesse: %d" -#: ../src/process-tree-view.c:129 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "Anwendung" +msgstr "Prozess" -#: ../src/process-tree-view.c:146 ../src/process-window.c:338 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:154 ../src/process-window.c:339 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:162 ../src/process-window.c:340 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Status" -#: ../src/process-tree-view.c:171 -#, fuzzy +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:179 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:187 ../src/process-window.c:343 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:195 ../src/process-window.c:344 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:204 -#, fuzzy +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio" +msgstr "Prio." -#: ../src/process-tree-view.c:333 +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Anwendung beenden" +msgstr "Prozess beenden" -#: ../src/process-tree-view.c:333 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Kill" +msgstr "Prozess töten" -#: ../src/process-tree-view.c:335 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "Soll der Anwendung mit ID %d ein Signal gesendet werden?" +msgstr "Soll dem Prozess mit der PID %d ein Signal gesendet werden?" -#: ../src/process-tree-view.c:347 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Signal konnte nicht gesendet werden" -#: ../src/process-tree-view.c:349 -#, fuzzy, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." -msgstr "Beim Senden eines Signals an die Anwendung mit der ID %d ist ein Fehler aufgetreten. Möglicherweise haben Sie nicht die notwendigen Rechte." +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Beim Senden eines Signals an den Prozess mit der PID %d ist ein Fehler aufgetreten. Möglicherweise haben Sie nicht die erforderlichen Rechte. " -#: ../src/process-tree-view.c:367 -#, fuzzy +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Fehler beim Setzen der Priorität" -#: ../src/process-tree-view.c:368 -#, fuzzy, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." -msgstr "Beim Senden eines Signals an die Anwendung mit der ID %d ist ein Fehler aufgetreten. Möglicherweise haben Sie nicht die notwendigen Rechte." +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "Beim Setzen der Priorität für den Prozess mit der PID %d ist ein Fehler aufgetreten. Möglicherweise haben Sie nicht die erforderlichen Rechte." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Beenden" -#: ../src/process-tree-view.c:386 -#, fuzzy +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Anhalten" -#: ../src/process-tree-view.c:393 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Fortsetzen" -#: ../src/process-tree-view.c:399 -#, fuzzy +#: ../src/process-tree-view.c:433 msgid "Kill" -msgstr "Kill" +msgstr "Töten" -#: ../src/process-tree-view.c:404 -#, fuzzy -msgid "Terminate" -msgstr "Beenden" - -#: ../src/process-tree-view.c:411 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Sehr niedrig" -#: ../src/process-tree-view.c:416 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Niedrig" -#: ../src/process-tree-view.c:421 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "Mittel" +msgstr "Normal" -#: ../src/process-tree-view.c:426 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Hoch" -#: ../src/process-tree-view.c:431 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Sehr hoch" -#: ../src/process-tree-view.c:436 ../src/process-window.c:345 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Priorität" -#: ../src/process-window.c:183 -#, fuzzy -msgid "Execution error" -msgstr "Ausführungsfehler" - -#: ../src/process-window.c:222 ../src/process-window.c:224 -#: ../src/process-window.c:226 -#, fuzzy -msgid "Run Program..." -msgstr "Befehl ausführen" - -#: ../src/process-window.c:229 -msgid "Application Finder" -msgstr "Anwendungsfinder" - -#: ../src/process-window.c:232 -msgid "Terminal emulator" +#: ../src/process-window.c:312 +msgid "translator-credits" msgstr "" -#: ../src/process-window.c:234 -#, fuzzy -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Achtung, Sie arbeiten mit Administartorrechten und können Ihr System beschädigen." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Standard" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Klein" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Groß" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Text" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Einstellungen des Taskmanagers" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Symbole der Anwendungen anzeigen" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Vollständige Befehlszeile anzeigen" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Werte mit höherer Genauigkeit anzeigen" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Rand um Monitore zeichnen" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Werkzeugleistenstil:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Oberflächenstil" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Beenden von Prozessen bestätigen" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Fenster in die Benachrichtigungsfläche minimieren" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Sonstiges" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Wiederholrate:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Spalten:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Information" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Einstellungen" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:278 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500ms" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750ms" -#: ../src/process-window.c:281 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1s" -#: ../src/process-window.c:282 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2s" -#: ../src/process-window.c:283 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5s" -#: ../src/process-window.c:284 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10s" -#: ../src/process-window.c:325 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Alle Prozesse anzeigen" -#: ../src/process-window.c:326 -#, fuzzy -msgid "More precision" -msgstr "Höhere Genauigkeit" - -#: ../src/process-window.c:327 -msgid "Full command line" -msgstr "" - -#: ../src/process-window.c:328 -msgid "Show status icon" -msgstr "" - -#: ../src/process-window.c:331 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" -msgstr "" +msgstr "Wiederholrate" -#: ../src/process-window.c:341 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Virtuelle Bytes" -#: ../src/process-window.c:342 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" - -#: ../src/process-window.c:406 -msgid "translator-credits" -msgstr "" -"Enrico Tröger\n" -"Fabian Nowak\n" -"Johannes Zellner\n" -"Paul Seyfert" +msgstr "Virtuelle Bytes" #: ../src/task-manager.c:229 -#, fuzzy, c-format +#, c-format msgid "%lu MiB" msgstr "%lu MiB" #: ../src/task-manager.c:236 -#, fuzzy, c-format +#, c-format msgid "%lu KiB" msgstr "%lu KiB" #: ../src/task-manager.c:240 -#, fuzzy, c-format +#, c-format msgid "%lu B" msgstr "%lu B" #: ../src/task-manager.c:263 -#, fuzzy, c-format +#, c-format msgid "%s%%" -msgstr "%0.0f %%" - -#: ../src/main.c:63 -#, fuzzy, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Prozesse: %u\n" -"CPU: %.0f%%\n" -"Speicher: %.0f%%\n" -"Auslagerungsspeicher: %.0f%%" - -#: ../src/main.c:71 -#, fuzzy, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Prozesse: %u\n" -"CPU: %.0f%%\n" -"Speicher: %.0f%%\n" -"Auslagerungsspeicher: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "Verwalten Sie Ihre Prozesse" - -#~ msgid "Process manager" -#~ msgstr "Prozessmanager" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Xfce4 Taskmanager" - -#~ msgid "Really kill the task?" -#~ msgstr "Prozess wirklich töten?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "%d MB von %d MB benutzt" - -#~ msgid "Cpu usage" -#~ msgstr "CPU-Auslastung" - -#~ msgid "Memory usage" -#~ msgstr "Speicherverbrauch" - -#~ msgid "Command" -#~ msgstr "Befehl" - -#~ msgid "VM-Size" -#~ msgstr "Speicher" - -#~ msgid "User" -#~ msgstr "Benutzer" - -#~ msgid "Show user tasks" -#~ msgstr "Zeige eigene Prozesse" - -#~ msgid "Show root tasks" -#~ msgstr "Zeige Systemprozesse" - -#~ msgid "Show other tasks" -#~ msgstr "Zeige fremde Prozesse" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Zeige vom Cache verwendeten Speicher als freien Speicher an" - -#~ msgid "Contributors:" -#~ msgstr "Mitwirkende:" - -#~ msgid "Couldn't set priority %d to the task with ID %d" -#~ msgstr "Konnte Priorität %d der Anwendunge mit ID %d nicht setzen" - -#~ msgid "xfce4-taskmanager" -#~ msgstr "xfce4-taskmanager" - -#~ msgid "more details" -#~ msgstr "Mehr Info" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/el.po xfce4-taskmanager-1.0.1/po/el.po --- xfce4-taskmanager-1.0.0/po/el.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/el.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,300 +1,371 @@ # translation of el.po to Greek # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Evaggelos Balaskas , 2008. # Stavros Giannouris , 2008. msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager git version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:08+0000\n" +"POT-Creation-Date: 2011-01-08 11:16+0000\n" "PO-Revision-Date: 2010-05-24 13:13+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: GREECE\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Greek\n" -"X-Poedit-Country: GREECE\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../xfce4-taskmanager.desktop.in.h:1 -#: ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Εύκολος στην χρήση διαχειριστής διεργασιών" -#: ../xfce4-taskmanager.desktop.in.h:2 -#: ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 -#: ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 -#: ../src/process-window.c:367 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Διαχειριστής εργασιών" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Σφάλμα εκτέλεσης" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Δεν βρέθηκε καμία προεπιλεγμένη εντολή προς εκτέλεση." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Εκτέλεση του Διαχειριστή Εργασιών ως υπερχρήστης" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Εκτέλεση προγράμματος..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Εύρεση εφαρμογής" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Προσομοιωτής τερματικού" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Διεργασίες: %u\n" +"Επεξεργαστής: %.0f%%\n" +"Μνήμη: %.0f%%\n" +"Εκτεταμένη μνήμη: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Διεργασίες: %u\n" +"Επεξεργαστής: %.0f%%\n" +"Μνήμη: %.0f%%\n" +"Εκτεταμένη μνήμη: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "Επεξεργαστής: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Μνήμη: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Εκτεταμένη μνήμη: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Διεργασίες: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Διεργασία" -#: ../src/process-tree-view.c:116 -#: ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 -#: ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 -#: ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Κατάσταση" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 -#: ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 -#: ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "Επεξεργαστής" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Προτ." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Τερματισμός διεργασίας" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Βίαιος τερματισμός διεργασίας" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Είστε σίγουροι ότι θέλετε να στείλετε αυτό το σήμα στην διεργασία με PID %d;" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Σφάλμα κατά την αποστολή σήματος" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." msgstr "Προέκυψε ένα σφάλμα κατά την αποστολή του σήματος στην διεργασία με PID %d. Είναι πιθανό να μην έχετε τα απαραίτητα δικαιώματα." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Σφάλμα κατά την ρύθμιση της προτεραιότητας" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." msgstr "Προέκυψε ένα σφάλμα κατά την ρύθμιση της προτεραιότητας στην διεργασία με PID %d. Είναι πιθανό να μην έχετε τα κατάλληλα δικαιώματα." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Τερματισμός" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Σταμάτημα" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Συνέχεια" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Βίαιος τερματισμός" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Τερματισμός" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Πολύ χαμηλή" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Χαμηλή" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Κανονική" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Υψηλή" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Πολύ υψηλή" -#: ../src/process-tree-view.c:312 -#: ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Προτεραιότητα" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Σφάλμα εκτέλεσης" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Εκτέλεση προγράμματος..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Εύρεση εφαρμογής" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Προσομοιωτής τερματικού" - -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "" +"Ευάγγελος Μπαλάσκας \n" +"Σταύρος Γιαννούρης \n" +"Βασιλάκος Γεώργιος " + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Προσοχή, χρησιμοποιείτε το λογαριασμό του υπερχρήστη, μπορεί να βλάψετε το σύστημά σας." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Προεπιλογή" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Μικρό" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Μεγάλο" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Κείμενο" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Πληροφορίες" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Στυλ διεπαφής" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Διάφορα" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Στήλες:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Σχεδίαση περιγράμματος γύρω από τις οθόνες" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Απόκρυψη στην περιοχή ειδοποιήσεων" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Ερώτηση για τον τερματισμό διεργασιών" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Ρυθμός ανανέωσης:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Ρυθμίσεις" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Ρυθμίσεις για το διαχειριστή εργασιών" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Εμφάνιση εικονιδίων εφαρμογής" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Εμφάνιση πλήρους γραμμής εντολών" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Εμφάνιση τιμών με μεγαλύτερη ακρίβεια" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Στυλ εργαλειοθήκης:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1δευτ" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2δευτ" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5δευτ" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10δευτ" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Εμφάνιση όλων των διεργασιών" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Περισσότερη ακρίβεια" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Πλήρη γραμμή εντολών" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Εμφάνιση εικονιδίου κατάστασης" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Ρυθμός ανανέωσης" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Εικονικά ψηφία" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Ιδιαίτερα ψηφία" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "" -"Ευάγγελος Μπαλάσκας\n" -"Σταύρος Γιαννούρης" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Διεργασίες: %u\n" -"Επεξεργαστής: %.0f%%\n" -"Μνήμη: %.0f%%\n" -"Εκτεταμένη μνήμη: %.0f%%" +#~ msgid "250ms" +#~ msgstr "250ms" -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Διεργασίες: %u\n" -"Επεξεργαστής: %.0f%%\n" -"Μνήμη: %.0f%%\n" -"Εκτεταμένη μνήμη: %.0f%%" +#~ msgid "More precision" +#~ msgstr "Περισσότερη ακρίβεια" +#~ msgid "Show status icon" +#~ msgstr "Εμφάνιση εικονιδίου κατάστασης" diff -Nru xfce4-taskmanager-1.0.0/po/en_AU.po xfce4-taskmanager-1.0.1/po/en_AU.po --- xfce4-taskmanager-1.0.0/po/en_AU.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/en_AU.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,352 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# k3lt01 , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Apps\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-07-29 09:13+0000\n" +"Last-Translator: k3lt01 \n" +"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce/language/en_AU/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_AU\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Task Manager" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Easy to use task manager" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Execution error" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Couldn't find any default command to run." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Run Task Manager as root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Run Program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Application Finder" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminal emulator" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processes: %u\nCPU: %.0f%%\nMemory: %.0f%%\nSwap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processes: %u\nCPU: %.0f%%\nMemory: %.0f%%\nSwap: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Memory: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Swap: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "Processes: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "Task" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "State" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "CPU" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "Prio." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "Terminate task" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "Kill task" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "Are you sure you want to send a signal to the PID %d?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "Error sending signal" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "Error setting priority" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Terminate" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "Stop" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "Continue" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "Kill" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "Very low" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "Low" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "Normal" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "High" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "Very high" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "Priority" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "translator-credits" + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Warning, you are using the root account, you may harm your system." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Default" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Small" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Large" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Text" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Settings for Task Manager" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Show application icons" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Show full command lines" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Show values with more precision" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Draw borders around monitors" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Toolbar style:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Interface style" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Prompt for terminating tasks" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Hide into the notification area" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Miscellaneous" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Refresh rate:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Columns:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Information" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Settings" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "Show all processes" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Refresh rate" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "Virtual Bytes" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "Private Bytes" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/en_GB.po xfce4-taskmanager-1.0.1/po/en_GB.po --- xfce4-taskmanager-1.0.0/po/en_GB.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/en_GB.po 2014-01-08 18:42:02.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2007 THE xfce4-taskmanager'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-taskmanager package. # Jeff Bailes , 2007. -# , fuzzy -# -# +#, fuzzy +# +# msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" +"POT-Creation-Date: 2010-12-16 05:14+0000\n" "PO-Revision-Date: 2009-08-18 12:01+1000\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English/GB\n" @@ -17,215 +17,342 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4-Taskmanager is an easy to use taskmanager" +msgstr "Easy to use task manager" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Xfce4 Taskmanager" +msgstr "Task Manager" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Execution error" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Couldn't find any default command to run." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Run Task Manager as root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Run Program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Application Finder" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminal emulator" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Memory: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Swap: %s%%" + +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Processes: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Task" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "State" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio" +msgstr "Prio." -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Really terminate the task?" +msgstr "Terminate task" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Kill" +msgstr "Kill task" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Are you sure you want to send a signal to the PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "Error sending signal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "Error setting priority" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Term" +msgstr "Terminate" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Stop" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Continue" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Kill" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Very low" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Low" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "High" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Very high" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Priority" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" - -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Original Author:" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Jeff Bailes" -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Term" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Warning, you are using the root account, you may harm your system." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Default" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Small" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Large" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Text" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Information" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Interface style" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Miscellaneous" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Columns:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Draw borders around monitors" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Hide into the notification area" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Prompt for terminating tasks" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Refresh rate:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Settings" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Settings for Task Manager" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Show application icons" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Show full command lines" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Show values with more precision" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Toolbar style:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Control your processes" +msgstr "Show all processes" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Refresh rate" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Virtual Bytes" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" +msgstr "Private Bytes" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "Jeff Bailes" - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" #~ msgid "Control your processes" #~ msgstr "Control your processes" @@ -245,9 +372,6 @@ #~ msgid "Cpu usage" #~ msgstr "CPU usage" -#~ msgid "Memory usage" -#~ msgstr "Memory usage" - #~ msgid "Command" #~ msgstr "Command" diff -Nru xfce4-taskmanager-1.0.0/po/es.po xfce4-taskmanager-1.0.1/po/es.po --- xfce4-taskmanager-1.0.0/po/es.po 2010-06-04 12:44:30.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/es.po 2014-01-08 18:42:02.000000000 +0000 @@ -7,39 +7,92 @@ msgstr "" "Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-04 04:08+0000\n" -"PO-Revision-Date: 2010-06-04 10:32+0100\n" -"Last-Translator: Abel Martín \n" +"POT-Creation-Date: 2013-05-17 09:30+0000\n" +"PO-Revision-Date: 2013-05-17 05:44-0600\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" -#: ../xfce4-taskmanager.desktop.in.h:1 -#: ../src/process-window.c:399 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Administrador de tareas fácil de usar" +msgstr "Un gestor de tareas fácil de usar" -#: ../xfce4-taskmanager.desktop.in.h:2 -#: ../src/process-tree-view.c:320 -#: ../src/process-tree-view.c:335 -#: ../src/process-tree-view.c:354 -#: ../src/process-window.c:181 -#: ../src/process-window.c:394 -#: ../src/main.c:119 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Administrador de tareas" +msgstr "Gestor de tareas" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Error de ejecución" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "No se pudo encontrar ninguna orden predeterminada a ejecutar." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Ejecutar el Gestor de tareas como administrador" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Ejecutar un programa…" + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Buscador de aplicaciones" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulador de terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesos: %u\n" +"CPU: %.0f%%\n" +"Memoria: %.0f%%\n" +"Área de intercambio: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesos: %u\n" +"CPU: %.0f%%\n" +"Memoria: %.0f%%\n" +"Área de intercambio: %.0f%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" -msgstr "Memory: %s%%" +msgstr "Memoria: %s%%" #: ../src/process-statusbar.c:166 #, c-format @@ -51,275 +104,310 @@ msgid "Processes: %d" msgstr "Procesos: %d" -#: ../src/process-tree-view.c:120 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Tarea" -#: ../src/process-tree-view.c:130 -#: ../src/process-window.c:334 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:138 -#: ../src/process-window.c:335 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:146 -#: ../src/process-window.c:336 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Estado" -#: ../src/process-tree-view.c:155 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:163 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:171 -#: ../src/process-window.c:339 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:179 -#: ../src/process-window.c:340 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:188 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:317 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Terminar tarea" -#: ../src/process-tree-view.c:317 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Matar tarea" -#: ../src/process-tree-view.c:319 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "¿Está seguro de que quiere enviar una señal al PID %d?" -#: ../src/process-tree-view.c:331 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Error al enviar la señal" -#: ../src/process-tree-view.c:333 +#: ../src/process-tree-view.c:368 #, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." -msgstr "Se detectó un error al enviar una señal al PID %d. Es probable que no tenga los privilegios necesarios." +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you " +"don't have the required privileges." +msgstr "" +"Se detectó un error al enviar una señal al PID %d. Es probable que no tenga " +"los privilegios necesarios." -#: ../src/process-tree-view.c:351 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Error al establecer la prioridad" -#: ../src/process-tree-view.c:352 +#: ../src/process-tree-view.c:396 #, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." -msgstr "Se detectó un error al establecer una prioridad para el PID %d. Es probable que no tenga los privilegios necesarios." +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "" +"Se detectó un error al establecer una prioridad para el PID %d. Es probable " +"que no tenga los privilegios necesarios." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Terminar" -#: ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:420 msgid "Stop" -msgstr "Parar" +msgstr "Detener" -#: ../src/process-tree-view.c:377 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Continuar" -#: ../src/process-tree-view.c:383 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Matar" -#: ../src/process-tree-view.c:388 -msgid "Terminate" -msgstr "Terminar" - -#: ../src/process-tree-view.c:395 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Muy baja" -#: ../src/process-tree-view.c:400 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Baja" -#: ../src/process-tree-view.c:405 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Normal" -#: ../src/process-tree-view.c:410 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Alta" -#: ../src/process-tree-view.c:415 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Muy alta" -#: ../src/process-tree-view.c:420 -#: ../src/process-window.c:341 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioridad" -#: ../src/process-window.c:179 -msgid "Execution error" -msgstr "Error de ejecución" - -#: ../src/process-window.c:218 -#: ../src/process-window.c:220 -#: ../src/process-window.c:222 -msgid "Run Program..." -msgstr "Ejecutar programa..." - -#: ../src/process-window.c:225 -msgid "Application Finder" -msgstr "Buscador de aplicaciones" - -#: ../src/process-window.c:228 -msgid "Terminal emulator" -msgstr "Emulador de terminal" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Abel Martín , 2009-2010" -#: ../src/process-window.c:230 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Aviso: está usando la cuenta de administrador, puede dañar su sistema." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Predeterminado" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Pequeño" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Grande" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Texto" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Información" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Estilo de la interfaz" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Varias" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Columnas:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Mostrar bordes alrededor de los monitores" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Ocultar en el área de notificación" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Avisar antes de terminar una tarea" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Tasa de actualización:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Configuración" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Configuración del Gestor de tareas" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Mostrar los iconos de las aplicaciones" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Mostrar líneas de órdenes completas" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Mostrar valores con más precisión" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Estilo de la barra:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:274 -msgid "250ms" -msgstr "250 ms" - -#: ../src/process-window.c:275 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500 ms" -#: ../src/process-window.c:276 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750 ms" -#: ../src/process-window.c:277 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1 s" -#: ../src/process-window.c:278 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2 s" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5 s" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10 s" -#: ../src/process-window.c:321 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Mostrar todos los procesos" +msgstr "Mostrar todos los procesos" -#: ../src/process-window.c:322 -msgid "More precision" -msgstr "Más precisión" - -#: ../src/process-window.c:323 -msgid "Full command line" -msgstr "Línea de órdenes completa" - -#: ../src/process-window.c:324 -msgid "Show status icon" -msgstr "Mostrar icono de estado" - -#: ../src/process-window.c:327 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" -msgstr "Tasa de refresco" +msgstr "Tasa de actualización" -#: ../src/process-window.c:337 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Bytes virtuales" -#: ../src/process-window.c:338 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Bytes privados" -#: ../src/process-window.c:402 -msgid "translator-credits" -msgstr "Abel Martín , 2009-2010" - -#: ../src/task-manager.c:191 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:198 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:202 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:218 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:63 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Procesos: %u\n" -"CPU: %.0f%%\n" -"Memoria: %.0f%%\n" -"Área de intercambio: %.0f%%" +#~ msgid "250ms" +#~ msgstr "250 ms" -#: ../src/main.c:71 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Procesos: %u\n" -"CPU: %.0f%%\n" -"Memoria: %.0f%%\n" -"Área de intercambio: %.0f%%" +#~ msgid "More precision" +#~ msgstr "Más precisión" + +#~ msgid "Show status icon" +#~ msgstr "Mostrar icono de estado" #~ msgid "Control your processes" #~ msgstr "Controle sus procesos" + #~ msgid "Process manager" #~ msgstr "Administrador de procesos" + #~ msgid "Xfce4 Taskmanager" #~ msgstr "Xfce4 Taskmanager" + #~ msgid "Really kill the task?" #~ msgstr "¿Realmente desea matar la tarea?" + #~ msgid "%d MB of %d MB used" #~ msgstr "%d MB de %d MB usados" + #~ msgid "Cpu usage" #~ msgstr "Uso de CPU" + #~ msgid "Command" #~ msgstr "Comando" + #~ msgid "VM-Size" #~ msgstr "Tamaño MV" + #~ msgid "User" #~ msgstr "UID" + #~ msgid "Show user tasks" #~ msgstr "Mostrar tareas de usuario" + #~ msgid "Show root tasks" #~ msgstr "Mostrar tareas raíz" + #~ msgid "Show other tasks" #~ msgstr "Mostrar otras tareas" + #~ msgid "Show memory used by cache as free" #~ msgstr "Mostrar memoria usada por caché como libre" + #~ msgid "Contributors:" #~ msgstr "Colaboradores:" - diff -Nru xfce4-taskmanager-1.0.0/po/eu.po xfce4-taskmanager-1.0.1/po/eu.po --- xfce4-taskmanager-1.0.0/po/eu.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/eu.po 2014-01-08 18:42:02.000000000 +0000 @@ -2,13 +2,13 @@ # Basque translations for PACKAGE package. # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Piarres Beobide , 2006, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" +"POT-Creation-Date: 2011-06-08 16:19+0000\n" "PO-Revision-Date: 2008-11-30 08:51+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -19,215 +19,341 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 1.2.0\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4 Zeregin-kudeatzaile zeregin kudeatzaile erabilerraz bat da" +msgstr " Zeregin kudeatzaile erabilerraz bat da" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "xfce4 zeregin-kudeatzailea" +msgstr "Zeregin kudeatzailea" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Exekuzio errorea" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Ez da exekutatzeko lehenetsiriko komandorik aurkitu" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Abiarazi zeregin kudeatzailea root gisa" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Exekutatu programa..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Aplikazio bilatzailea" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminal emuladorea" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Prozesuak: %u\n" +"CPU: %.0f%%\n" +"Memoria: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Prozesuak: %u\n" +"CPU: %.0f%%\\Memoria: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Memoria : %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Swap: %s%%" + +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Prozesuak: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Zeregina" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PIDa" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPIDa" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Egoera" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSSa" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PIDa" +msgstr "UIDa" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Leh" +msgstr "Leh." -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Benetan zeregina amaitu nahi duzu?" +msgstr "Amaitu zeregina" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Hil" +msgstr "Hil zeregina" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Ziur zaude %d PIDari seinale bat bidali nahi diozula?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "Errorea seinalea bidaltzean" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "Errore bat gertatu da %d PIDari seinale bat bidaltzean. Ziurrenik ez duzu pribilegiorik beharko." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "Errorea lehentasuna ezartzean" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "Errore bat gertatu dat %d PID-aren lehentasuna ezartzean. Honetarako beharrezko baimenik ez duzula dirudi." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Terminala" +msgstr "Amaitu" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Gelditu" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Jarraitu" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Hil" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Oso baxua" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Baxua" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Arrunta" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "Altua" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Oso altua" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Lehentasuna" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" - -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Jatorrizko garatzailea:" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "itzultzaile-kreditua" -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Terminala" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Adi, root kontua erabiltzen ari zara, zure sistema hondatu dezakezu." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Lehenetsia" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Txikia" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Handia" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Testua" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informazioa" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Interfaze estiloa/b>" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Bestelakoak" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Zutabeak:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Ertzak marraztu monitoreen inguruan" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Ezkutatu berri-emate eremuan" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Galdetu zereginak amaitzeko" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Freskatze aldia:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Ezarpenak:" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Zeregin-kudeatzaile ezarpenak" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Ikusi aplikazio ikonoak" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Ikusi komando-lerro osoak" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Ikusi balioak zehaztasun handiagoz" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Tresna-barra estiloa:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Kontrolatu zure prozesuak" +msgstr "Ikusi prozesu guztiak" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Freskatze aldia" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Byte birtualak" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" +msgstr "Byte pribatuak" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "itzultzaile-kreditua" - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%% %0.0f" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" #~ msgid "Control your processes" #~ msgstr "Kontrolatu zure prozesuak" @@ -247,9 +373,6 @@ #~ msgid "Cpu usage" #~ msgstr "Cpu erabilera" -#~ msgid "Memory usage" -#~ msgstr "Memoria erabilera" - #~ msgid "Command" #~ msgstr "Komandoa" diff -Nru xfce4-taskmanager-1.0.0/po/fi.po xfce4-taskmanager-1.0.1/po/fi.po --- xfce4-taskmanager-1.0.0/po/fi.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/fi.po 2014-01-08 18:42:02.000000000 +0000 @@ -9,99 +9,156 @@ msgstr "" "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:08+0000\n" -"PO-Revision-Date: 2010-05-24 12:48+0300\n" +"POT-Creation-Date: 2010-10-05 04:11+0000\n" +"PO-Revision-Date: 2010-10-05 11:42+0300\n" "Last-Translator: Jari Rahkonen \n" -"Language-Team: Finnish \n" +"Language-Team: Finnish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Helppokäyttöinen tehtävienhallinta" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:389 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Tehtävienhallinta" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Suoritusvirhe" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Suoritettavaa oletuskomentoa ei löydy" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Käynnistä tehtävienhallinta pääkäyttäjänä" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Suorita..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Sovellushaku" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Pääteohjelma" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Tehtäviä: %u\n" +"Suoritin: %.0f%%\n" +"Muisti: %.0f%%\n" +"Näennäismuisti: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Tehtäviä: %u\n" +"Suoritin: %.0f%%\n" +"Muisti: %.0f%%\n" +"Näennäismuisti: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "Suoritin: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Muisti: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Näennäismuisti: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Tehtäviä: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Tehtävä" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Tila" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "Suoritin" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Tärkeys" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Lopeta tehtävä" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Tapa tehtävä" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Haluatko varmasti lähettää signaalin tehtävälle %d" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Signaalin lähetysvirhe" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "" "An error was encountered by sending a signal to the PID %d. It is likely you " @@ -110,11 +167,11 @@ "Virhe lähetettäessä signaalia tehtävälle %d. Tämä johtuu todennäköisesti " "puuttuvista käyttöoikeuksista." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:386 msgid "Error setting priority" msgstr "Tärkeyden asetusvirhe" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:387 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " @@ -123,171 +180,185 @@ "Virhe asetettaessa prosessin %d tärkeysastetta. Tämä johtuu todennäköisesti " "puuttuvista käyttöoikeuksista." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:403 +msgid "Terminate" +msgstr "Lopeta" + +#: ../src/process-tree-view.c:410 msgid "Stop" msgstr "Keskeytä" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:417 msgid "Continue" msgstr "Jatka" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:423 msgid "Kill" msgstr "Tapa" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Lopeta" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:430 msgid "Very low" msgstr "Hyvin alhainen" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:435 msgid "Low" msgstr "Alhainen" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:440 msgid "Normal" msgstr "Normaali" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:445 msgid "High" msgstr "Korkea" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:450 msgid "Very high" msgstr "Hyvin korkea" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:455 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Tärkeys" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Suoritusvirhe" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Suorita..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Sovellushaku" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Pääteohjelma" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "" +"Pasi Sulasalmi\n" +"Jari Rahkonen" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Varoitus: Pääkäyttäjänä voit vahingoittaa järjestelmääsi." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Oletus" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Pieni" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Suuri" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Teksti" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Tiedot" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Käyttöliittymä" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Muut" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Sarakkeet:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Kehystä seurantanäytöt" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Pienennä huomautusalueelle" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Varmista tehtävien keskeytys" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Päivitysväli:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Asetukset" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Tehtävienhallinnan asetukset" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Näytä sovelluskuvakkeet" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Näytä täydet komentorivit" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Näytä tarkemmat lukuarvot" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Työkalupalkin tyyli:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250 ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500 ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750 ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1 s" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2 s" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5 s" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10 s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Näytä kaikki tehtävät" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Lisää tarkkuutta" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Komentorivi" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Näytä tilakuvake" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Päivitysväli" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Näennäiset tavut" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Yksityiset tavut" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "" -"Pasi Sulasalmi\n" -"Jari Rahkonen" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Tehtäviä: %u\n" -"Suoritin: %.0f%%\n" -"Muisti: %.0f%%\n" -"Näennäismuisti: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Tehtäviä: %u\n" -"Suoritin: %.0f%%\n" -"Muisti: %.0f%%\n" -"Näennäismuisti: %.0f%%" diff -Nru xfce4-taskmanager-1.0.0/po/fr.po xfce4-taskmanager-1.0.1/po/fr.po --- xfce4-taskmanager-1.0.0/po/fr.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/fr.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,296 +1,352 @@ -# French translation of the xfce4-taskmanager package. -# Copyright (C) 2005 Johannes Zellner. -# This file is distributed under the same license as the xfce4-taskmanager package. -# Peggy Kutyla , 2005. -# Maximilian Schleiss , 2006-2007. -# Mike Massonnet , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# jc1 , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-taskmanager\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 00:53+0000\n" -"PO-Revision-Date: 2010-05-10 22:30+0200\n" -"Last-Translator: Mike Massonnet \n" -"Language-Team: French \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-08-04 09:40+0000\n" +"Last-Translator: jc1 \n" +"Language-Team: French (http://www.transifex.com/projects/p/xfce/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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 -msgid "Easy to use task manager" -msgstr "Gestionnaire de tâches simple et léger" - -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Gestionnaire de tâches" -#: ../src/process-statusbar.c:139 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Facile à utiliser le gestionnaire de tâches" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Erreur d'exécution" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Impossible de trouver une commande par défaut pour exécuter." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Exécutez le gestionnaire des tâches en tant que root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Exécuter le programme ..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Liste des applications" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Émulateur de terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processus : %u\nProcesseur : %.0f%%\nMémoire : %.0f%%\nFichier d'échange : %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processus : %u\nProcesseur : %.0f%%\nMémoire : %.0f%%\nFichier d'échange : %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" -msgstr "CPU : %s%%" +msgstr "Processeur : %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Mémoire : %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" -msgstr "Mémoire paginée : %s%%" +msgstr "Fichier d'échange : %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Processus : %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Tâche" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "État" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU" +msgstr "Processeur" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Terminer une tâche" +msgstr "Terminer la tâche" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Tuer une tâche" +msgstr "Tuer la tâche" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "Êtes-vous certain(e) de vouloir envoyer un signal au PID %d ?" +msgstr "Êtes-vous sûr que vous voulez envoyer un signal au PID %d ?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "Erreur envoie de signal" +msgstr "Erreur d'envoi du signal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." -msgstr "Une erreur est survenue lors de l'envoie d'un signal au PID %d. Il est probable que vous ne possédez pas des privilèges requis." +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Une erreur s'est produite en envoyant un signal au PID %d. Il est probable que vous n'avez pas les privilèges requis." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "Erreur changement de priorité" +msgstr "Erreur de réglage des priorités" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." -msgstr "Une erreur est survenue lors du changement de priorité sur le PID %d. Il est probable que vous ne possédez pas des privilèges requis." +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "Une erreur s'est produite en définissant une priorité pour le PID %d . Il est probable que vous n'avez pas les privilèges requis." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Terminer" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Stopper" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Continuer" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Tuer" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Terminer" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Très basse" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Basse" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Normale" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Haute" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Très haute" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Priorité" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Erreur d'exécution" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Lancer un programme..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Liste des applications" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Émulateur de terminal" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Traducteur-crédits" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Attention, vous utilisez le compte root, vous pouvez endommager votre système." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Défaut" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Petit" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Grand" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Texte" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Paramètres du gestionnaire de tâches" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Voir les icônes des applications" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Voir les lignes de commande complètes" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Voir les valeurs avec plus de précision" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Tracer des bordures autour des moniteurs" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Style de la barre d'outils :" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Style de l'interface " + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Prompt pour terminer des tâches" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Masquer dans la zone de notification" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Divers" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Taux de rafraîchissement :" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Colonnes :" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Information" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Paramètres" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" -msgstr "500ms" +msgstr "500 ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" -msgstr "750ms" +msgstr "750 ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" -msgstr "1s" +msgstr "1 s" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" -msgstr "2s" +msgstr "2 s" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" -msgstr "5s" +msgstr "5 s" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" -msgstr "10s" +msgstr "10 s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Afficher tous les processus" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Plus de précision" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Ligne de commande entière" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Afficher une icône de statut" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Taux de rafraîchissement" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "Mémoire virtuelle" +msgstr "Octets virtuels" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "Mémoire privée" - -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "" -"Maximilian Schleiss\n" -"Mike Massonnet\n" -"Peggy Kutyla" +msgstr "Octets privés" -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "%lu MiB" +msgstr "%lu Mio" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "%lu KiB" +msgstr "%lu Kio" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "%lu B" +msgstr "%lu O" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processus : %u\n" -"CPU : %.0f%%\n" -"Mémoire : %.0f%%\n" -"Mémoire paginée: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processus : %u\n" -"CPU : %.0f%%\n" -"Mémoire : %.0f%%\n" -"Mémoire paginée: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "Contrôler vos processus" - -#~ msgid "Process manager" -#~ msgstr "Gestionnaire de tâches" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Gestionnaire de tâches Xfce4" diff -Nru xfce4-taskmanager-1.0.0/po/gl.po xfce4-taskmanager-1.0.1/po/gl.po --- xfce4-taskmanager-1.0.0/po/gl.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/gl.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,19 +1,19 @@ # Galician translation of xfce4-taskmanager # Copyright (C) 2008-2009 Leandro Regueiro # This file is distributed under the same license as the xfce4-taskmanager package. -# +# # Leandro Regueiro , 2006, 2008, 2009. # Miguel Anxo Bouzada , 2008. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:08+0000\n" -"PO-Revision-Date: 2009-07-15 18:07+0100\n" +"POT-Creation-Date: 2010-10-04 17:56+0000\n" +"PO-Revision-Date: 2010-11-02 18:23+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" @@ -21,317 +21,396 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 +#: ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Xestor de tarefas fácil de usar" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 +#: ../xfce4-taskmanager.desktop.in.h:2 +#: ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 +#: ../src/main.c:156 +#: ../src/process-tree-view.c:366 +#: ../src/process-tree-view.c:381 +#: ../src/process-tree-view.c:400 +#: ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Xestor de tarefas" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 +#: ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Erro de execución" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Non foi posible atopar ningunha orde predefinida para executar." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Executar o Xestor de tarefas como root" + +#: ../src/exec-tool-button.c:175 +#: ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Executar programa..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Buscador de aplicativos" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulador de terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesos: %u\n" +"CPU: %.0f%%\n" +"Memoria: %.0f%%\n" +"Espazo de intercambio: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesos: %u\n" +"CPU: %.0f%%\n" +"Memoria: %.0f%%\n" +"Espazo de intercambio: %.0f%%" + +#: ../src/process-statusbar.c:148 +#: ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 +#: ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Memoria: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Espazo de intercambio: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Procesos: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:126 msgid "Task" msgstr "Tarefa" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:137 +#: ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:145 +#: ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:153 +#: ../src/settings-tool-button.c:176 msgid "State" msgstr "Estado" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:162 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:170 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:178 +#: ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:186 +#: ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:195 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:363 msgid "Terminate task" msgstr "Rematar a tarefa" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:363 msgid "Kill task" msgstr "Matar a tarefa" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:365 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Está seguro de que desexa enviar un sinal ao PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:377 msgid "Error sending signal" msgstr "Produciuse un erro ao enviar o sinal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:379 #, c-format msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." msgstr "Produciuse un erro ao enviar un sinal ao PID %d. O máis probable é que non teña os permisos necesarios." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:397 msgid "Error setting priority" msgstr "Produciuse un erro ao definir a prioridade" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:398 #, c-format msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." msgstr "Produciuse un erro ao definir a prioridade do PID %d. O máis probable é que non teña os permisos necesarios." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:414 +msgid "Terminate" +msgstr "Rematar" + +#: ../src/process-tree-view.c:421 msgid "Stop" msgstr "Deter" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:428 msgid "Continue" msgstr "Continuar" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:434 msgid "Kill" msgstr "Matar" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Rematar" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:441 msgid "Very low" msgstr "Moi baixa" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:446 msgid "Low" msgstr "Baixa" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:451 msgid "Normal" msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:456 msgid "High" msgstr "Alta" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:461 msgid "Very high" msgstr "Moi alta" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:466 +#: ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioridade" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Erro de execución" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Executar programa..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Buscador de aplicativos" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Emulador de terminal" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "" +"Leandro Regueiro , 2006, 2008, 2009, 2010.\n" +"Miguel Anxo Bouzada , 2008.\n" +"\n" +"Proxecto Trasno http://www.trasno.net" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Advertencia, está usando a conta de root, pode danar o sistema." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Predefinido" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Pequeno" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Grande" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Texto" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Información" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Estilo da interface" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Miscelánea" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Columnas:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Debuxar bordos arredor dos monitores" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Ocultar na área de notificación" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Preguntar para rematar as tarefas" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Frecuencia de actualización:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Opcións" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Opcións do Xestor de tarefas" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Mostrar iconas dos aplicativos" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Mostrar liñas de ordes completas" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Mostrar os valores con máis precisión" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Estilo da barra de ferramentas:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250 ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500 ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750 ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1s" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2s" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5s" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Mostrar todos os procesos" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Máis precisión" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Liña de comandos completa" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Mostrar a icona de estado" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Frecuencia de actualización" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Bytes virtuais" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Bytes privados" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "" -"Leandro Regueiro , 2006, 2008, 2009, 2010.\n" -"Miguel Anxo Bouzada , 2008.\n" -"\n" -"Proxecto Trasno http://www.trasno.net" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Procesos: %u\n" -"CPU: %.0f%%\n" -"Memoria: %.0f%%\n" -"Espazo de intercambio: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Procesos: %u\n" -"CPU: %.0f%%\n" -"Memoria: %.0f%%\n" -"Espazo de intercambio: %.0f%%" - +#~ msgid "More precision" +#~ msgstr "Máis precisión" +#~ msgid "Show status icon" +#~ msgstr "Mostrar a icona de estado" +#~ msgid "250ms" +#~ msgstr "250 ms" #~ msgid "Control your processes" #~ msgstr "Controle os seus procesos" - #~ msgid "Process manager" #~ msgstr "Xestor de procesos" - #~ msgid "Xfce4 Taskmanager" #~ msgstr "Xestor de tarefas de Xfce4" - #~ msgid "Really kill the task?" #~ msgstr "De verdade desexa matar a tarefa?" - #~ msgid "%d MB of %d MB used" #~ msgstr "usa %d MB de %d MB" - #~ msgid "Cpu usage" #~ msgstr "Uso da cpu" - #~ msgid "Memory usage" #~ msgstr "Uso da memoria" - #~ msgid "Command" #~ msgstr "Comando" - #~ msgid "VM-Size" #~ msgstr "Tamaño MV" - #~ msgid "User" #~ msgstr "Usuario" - #~ msgid "Show user tasks" #~ msgstr "Amosar as tarefas do usuario" - #~ msgid "Show root tasks" #~ msgstr "Amosar as tarefas de root" - #~ msgid "Show other tasks" #~ msgstr "Amosar outras tarefas" - #~ msgid "Show memory used by cache as free" #~ msgstr "Mostrar a memoria da caché coma memoria libre" - #~ msgid "Contributors:" #~ msgstr "Contribuíntes:" + diff -Nru xfce4-taskmanager-1.0.0/po/he.po xfce4-taskmanager-1.0.1/po/he.po --- xfce4-taskmanager-1.0.0/po/he.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/he.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,352 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Yaron Shahrabani , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Apps\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-11-06 08:59+0000\n" +"Last-Translator: Yaron Shahrabani \n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/xfce/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" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "מנהל המשימות" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "מנהל משימות קל לשימוש" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "שגיאת הפעלה" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "לא ניתן למצוא פקודה להרצה." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "הפעלת מנהל המשימות כמשתמש העל (root)" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "הפעלת תכנית…" + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "מאתר יישומים" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "מדמה מסוף" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "תהליכים: %u\nמעבד: %.0f%%\nזיכרון: %.0f%%\nהחלפה: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "תהליכים: %u\nמעבד: %.0f%%\nזיכרון: %.0f%%\nהחלפה: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "מעבד: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "זיכרון: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "החלפה: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "תהליכים: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "משימה" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "מזהה תהליך" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "מצב" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "מעבד" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "עדיפות" + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "חיסול משימה" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "הריגת משימה" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "האם אכן לשלוח את האות למזהה התהליך %d?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "שליחת האות נכשלה" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "אירעה שגיאה בעת שליחת אות לתהליך מס׳ %d. כנראה שאין לך את ההרשאות הנדרשות." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "הגדרת העדיפות נכשלה" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "אירעה שגיאה בעת הגדרת העדיפות לתהליך מס׳ %d. כנראה שאין לך את ההרשאות הנדרשות." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "חיסול" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "עצירה" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "המשך" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "הריגה" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "נמוכה מאוד" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "נמוכה" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "רגילה" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "גבוהה" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "גבוהה מאוד" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "עדיפות" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "ירון שהרבני " + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "אזהרה, החשבון שבשימוש הוא של משתמש העל (root), עשוי להיגרם נזק למערכת." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "בררת מחדל" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "קטן" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "גדול" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "טקסט" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "הגדרות מנהל המשימות" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "הצגת סמלי היישומים" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "הצגת שורות פקודה מלאות" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "הצגת ערכים עם דיוק רב יותר" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "ציור מסגרות מסביב לצגים" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "סגנון סרגל הכלים:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "סגנון המנשק" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "הצגת בקשה לחיסול משימות" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "הסתרה באזור הדיווחים" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "שונות" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "קצב רענון:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "עמודות:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "פרטים" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "הגדרות" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500 מ״ש" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750 מ״ש" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "שנייה אחת" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2 שניות" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5 שניות" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10 שניות" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "הצגת כל התהליכים" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "קצב רענון" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "בתים וירטואליים" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "בתים פרטיים" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu ב׳" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/hr.po xfce4-taskmanager-1.0.1/po/hr.po --- xfce4-taskmanager-1.0.0/po/hr.po 2010-06-13 14:17:28.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/hr.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,38 +1,88 @@ -# Croatian translations for xfce4-taskmanager package. -# Copyright (C) 2010 Johannes Zellner -# This file is distributed under the same license as the xfce4-taskmanager package. -# Ivica KOlić, 2010. -# Ivica Kolić <>, 2010. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Ivica Kolić , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-taskmanager 0.4.0\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-10 10:08+0000\n" -"PO-Revision-Date: 2010-06-10 17:39+0200\n" -"Last-Translator: Ivica Kolić <>\n" -"Language-Team: Croatian <>\n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-09-10 04:48+0000\n" +"Last-Translator: Ivica Kolić \n" +"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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" +"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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:413 -msgid "Easy to use task manager" -msgstr "Lagan za upotrebu upravitelj zadacima" - -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:339 -#: ../src/process-tree-view.c:354 ../src/process-tree-view.c:373 -#: ../src/process-window.c:195 ../src/process-window.c:408 ../src/main.c:156 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Upravitelj zadacima" -#: ../src/process-statusbar.c:148 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Lagan za korištenje upravitelj zadacima" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Greška izvršenja" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Pokreni program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Nalaznik programa" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulator terminala" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Procesi: %u\nProcesor: %.0f%%\nMemorija: %.0f%%\nSwap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Procesi: %u\nProcesor: %.0f%%\nMemorija: %.0f%%\nSwap: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "Procesor: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Memorija: %s%%" @@ -45,202 +95,242 @@ #: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "Procesi: %d" +msgstr "Procesi: %d" -#: ../src/process-tree-view.c:131 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Zadatak" -#: ../src/process-tree-view.c:148 ../src/process-window.c:348 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:156 ../src/process-window.c:349 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:164 ../src/process-window.c:350 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" -msgstr "Stanje" +msgstr "" -#: ../src/process-tree-view.c:173 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:181 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:189 ../src/process-window.c:353 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:197 ../src/process-window.c:354 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "Procesor" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:206 +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio." +msgstr "" -#: ../src/process-tree-view.c:336 +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Prekini zadatak" +msgstr "" -#: ../src/process-tree-view.c:336 +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Ubij zadatak" +msgstr "" -#: ../src/process-tree-view.c:338 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "" -#: ../src/process-tree-view.c:350 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "Greška u slanju signala" +msgstr "Greška slanja signala" -#: ../src/process-tree-view.c:352 +#: ../src/process-tree-view.c:368 #, c-format msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." msgstr "" -#: ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "Greška u postavljanju prioriteta" +msgstr "" -#: ../src/process-tree-view.c:371 +#: ../src/process-tree-view.c:396 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " "you don't have the required privileges." msgstr "" -#: ../src/process-tree-view.c:389 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Stop" -#: ../src/process-tree-view.c:396 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Nastavi" -#: ../src/process-tree-view.c:402 +#: ../src/process-tree-view.c:433 msgid "Kill" -msgstr "Ubij" - -#: ../src/process-tree-view.c:407 -msgid "Terminate" -msgstr "Prekini" +msgstr "" -#: ../src/process-tree-view.c:414 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "Vrlo nisko" +msgstr "" -#: ../src/process-tree-view.c:419 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "Nisko" +msgstr "" -#: ../src/process-tree-view.c:424 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Normalno" -#: ../src/process-tree-view.c:429 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "Visoko" +msgstr "" -#: ../src/process-tree-view.c:434 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "Vrlo visoko" +msgstr "" -#: ../src/process-tree-view.c:439 ../src/process-window.c:355 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioritet" -#: ../src/process-window.c:193 -msgid "Execution error" -msgstr "Greška u izvršavanju" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Ivica Kolić (zvacet) " -#: ../src/process-window.c:232 ../src/process-window.c:234 -#: ../src/process-window.c:236 -msgid "Run Program..." -msgstr "Pokreni program" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Upozorenje, koristite korijenski račun, možete oštetiti vaš sustav." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Zadano" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Malo" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Veliko" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Tekst" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Postavke upravitelja zadacima" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Pokaži ikone programa" -#: ../src/process-window.c:239 -msgid "Application Finder" -msgstr "Tražitelj programa" +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "" -#: ../src/process-window.c:242 -msgid "Terminal emulator" +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Prikaži vrijednosti sa više preciznosti" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" msgstr "" -#: ../src/process-window.c:244 -msgid "XTerm" +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Stil alatne trake" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Stil sučelja" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" msgstr "" -#. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:288 -msgid "250ms" -msgstr "250ms" +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Sakrij u području obavijesti" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Stupci:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Informacija" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Postavke" -#: ../src/process-window.c:289 +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500ms" -#: ../src/process-window.c:290 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750ms" -#: ../src/process-window.c:291 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1s" -#: ../src/process-window.c:292 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2s" -#: ../src/process-window.c:293 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10s" -#: ../src/process-window.c:335 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Pokaži sve procese" -#: ../src/process-window.c:336 -msgid "More precision" -msgstr "Više preciznosti" - -#: ../src/process-window.c:337 -msgid "Full command line" -msgstr "Cijeli naredbeni redak" - -#: ../src/process-window.c:338 -msgid "Show status icon" -msgstr "Pokaži statusnu ikonu" - -#: ../src/process-window.c:341 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" -msgstr "Brzina osvježavanja" +msgstr "" -#: ../src/process-window.c:351 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "" -#: ../src/process-window.c:352 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "" -#: ../src/process-window.c:416 -msgid "translator-credits" -msgstr "Ivica Kolić (zvacet) " - #: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" @@ -260,29 +350,3 @@ #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:100 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Procesi: %u\n" -"CPU: %.0f%%\n" -"Memorija: %.0f%%\n" -"Swap: %.0f%%" - -#: ../src/main.c:108 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Procesi: %u\n" -"CPU: %.0f%%\n" -"Memorja: %.0f%%\n" -"Swap: %.0f%%" diff -Nru xfce4-taskmanager-1.0.0/po/hu.po xfce4-taskmanager-1.0.1/po/hu.po --- xfce4-taskmanager-1.0.0/po/hu.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/hu.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,334 +1,365 @@ # Hungarian translation for xfce4-taskmanager # Copyright 2006, 2009. Free Software Foundation, Inc. # This file is distributed under the same license as the xfce4-taskmanager package. -# +# # SZERVÁC Attila , 2006. -# Gabor Kelemen , 2006, 2009. +# Gabor Kelemen , 2006, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 10:09+0000\n" -"PO-Revision-Date: 2009-07-24 22:09+0200\n" +"POT-Creation-Date: 2010-11-03 11:12+0000\n" +"PO-Revision-Date: 2010-11-27 01:55+0100\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-07-23 16:56+0000\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Egyszerűen használható feladatkezelő" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:389 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Feladatkezelő" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Végrehajtási hiba" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Nem található futtatható alapértelmezett parancs." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Feladatkezelő futtatása rootként" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Program futtatása…" + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Alkalmazáskereső" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminálemulátor" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Folyamatok: %u\n" +"CPU: %.0f%%\n" +"Memória: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Folyamatok: %u\n" +"CPU: %.0f%%\n" +"Memória: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Memória: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Swap: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Folyamatok: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Feladat" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Állapot" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VMR" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view -#. header. -#: ../src/process-tree-view.c:174 +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Feladat befejeztetése" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Feladat kilövése" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Biztosan elküldi a szignált a(z) %d azonosítójú feladatnak?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Hiba a szignál küldésekor" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." -msgstr "Hiba történt a szignál küldésekor a(z) %d azonosítójú feladatnak. Valószínűleg nincsenek megfelelő jogosultságai." +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you " +"don't have the required privileges." +msgstr "" +"Hiba történt a szignál küldésekor a(z) %d azonosítójú feladatnak. " +"Valószínűleg nincsenek megfelelő jogosultságai." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:386 msgid "Error setting priority" msgstr "Hiba a prioritás beállításakor" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:387 #, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." -msgstr "Hiba történt a(z) %d azonosítójú feladat prioritásának beállításakor. Valószínűleg nincsenek megfelelő jogosultságai." +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "" +"Hiba történt a(z) %d azonosítójú feladat prioritásának beállításakor. " +"Valószínűleg nincsenek megfelelő jogosultságai." + +#: ../src/process-tree-view.c:403 +msgid "Terminate" +msgstr "Befejeztetés" -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:410 msgid "Stop" msgstr "Leállítás" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:417 msgid "Continue" msgstr "Folytatás" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:423 msgid "Kill" msgstr "Kilövés" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Befejeztetés" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:430 msgid "Very low" msgstr "Nagyon alacsony" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:435 msgid "Low" msgstr "Alacsony" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:440 msgid "Normal" msgstr "Normál" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:445 msgid "High" msgstr "Magas" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:450 msgid "Very high" msgstr "Nagyon magas" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:455 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioritás" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Végrehajtási hiba" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Program futtatása…" - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Alkalmazáskereső" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Terminálemulátor" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Kelemen Gábor " -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Figyelmeztetés: a root fiókot használja, így károsíthatja rendszerét." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Alapértelmezett" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Kicsi" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Nagy" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Szöveg" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Információk" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Felület stílusa" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Egyéb" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Oszlopok:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Szegélyek rajzolása a monitorok körül" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Elrejtés az értesítési területre" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Kérdés feladatok befejeztetésekor" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Frissítési gyakoriság:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Beállítások" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Feladatkezelő beállításai" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Alkalmazásikonok megjelenítése" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Teljes parancssorok megjelenítése" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Értékek pontosabb megjelenítése" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Eszköztár stílusa:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250 ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500 ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750 ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1 s" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2 s" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5 s" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10 s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Minden folyamat megjelenítése" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Nagyobb pontosság" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Teljes parancssor" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Állapotikon megjelenítése" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Frissítési gyakoriság" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Virtuális bájtok" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Privát bájtok" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "Kelemen Gábor " - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Folyamatok: %u\n" -"CPU: %.0f%%\n" -"Memória: %.0f%%\n" -"Swap: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Folyamatok: %u\n" -"CPU: %.0f%%\n" -"Memória: %.0f%%\n" -"Swap: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "Folyamatok felügyelete" - -#~ msgid "Process manager" -#~ msgstr "Folyamatkezelő" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Xfce 4 folyamatkezelő" - -#~ msgid "Really kill the task?" -#~ msgstr "Valóban kilövi a feladatot?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "$%2d MB-ból $%1d MB használt" - -#~ msgid "Cpu usage" -#~ msgstr "CPU használat" - -#~ msgid "Memory usage" -#~ msgstr "Memóriahasználat" - -#~ msgid "Command" -#~ msgstr "Parancs" - -#~ msgid "VM-Size" -#~ msgstr "VM-méret" - -#~ msgid "User" -#~ msgstr "Felhasználó" - -#~ msgid "Show user tasks" -#~ msgstr "Felhasználói folyamatok megjelenítése" - -#~ msgid "Show root tasks" -#~ msgstr "Root folyamatok megjelenítése" - -#~ msgid "Show other tasks" -#~ msgstr "Egyéb folyamatok megjelenítése" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Gyorsítótár által használt memória megjelenítése szabadként" - -#~ msgid "Contributors:" -#~ msgstr "Hozzájárultak:" - -#~ msgid "Couldn't set priority %d to the task with ID %d" -#~ msgstr "Nem állítható be a prioritás (%d) a(z) %d azonosítójú feladathoz" diff -Nru xfce4-taskmanager-1.0.0/po/id.po xfce4-taskmanager-1.0.1/po/id.po --- xfce4-taskmanager-1.0.0/po/id.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/id.po 2014-01-08 18:42:02.000000000 +0000 @@ -2,12 +2,12 @@ # Copyright (C) 2005 Johannes Zellner. # This file is distributed under the same license as the xfce4-taskmanager package. # Andhika Padmawan , 2008. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" +"POT-Creation-Date: 2011-02-26 11:16+0000\n" "PO-Revision-Date: 2008-09-03 04:43+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" @@ -15,215 +15,342 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4-Taskmanager adalah manajer tugas yang mudah digunakan" +msgstr "Manajer tugas yang mudah digunakan" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Manajer Tugas Xfce4" +msgstr "Manajer Tugas" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Galat eksekusi" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Tak dapat menemukan perintah standar apapun untuk dijalankan." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Jalankan Manajer Tugas sebagai root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Jalankan Program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Pencari Aplikasi" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulator terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Proses: %u\n" +"CPU: %.0f%%\n" +"Memori: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Proses: %u\n" +"CPU: %.0f%%\n" +"Memori: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Memori: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Swap: %s%%" + +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Proses: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Tugas" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Status" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio" +msgstr "Prio." -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Yakin ingin menutup tugas?" +msgstr "Matikan tugas" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Matikan" +msgstr "Matikan tugas" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Apakah anda yakin ingin mengirim sinyal ke PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "Galat mengirim sinyal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "Sebuah galat terjadi dengan mengirim sinyal ke PID %d. Sepertinya anda tidak mempunyai hak akses yang diperlukan." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "Galat mengatur prioritas" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "Sebuah galat terjadi ketika mengatur prioritas ke PID %d. Sepertinya anda tidak mempunyai hak akses yang diperlukan." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Tutup" +msgstr "Matikan" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Stop" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Lanjutkan" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Matikan" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Sangat rendah" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Rendah" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "Tinggi" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Sangat tinggi" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioritas" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" - -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Penulis Asli:" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Andhika Padmawan , 2008" -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Tutup" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Peringatan, anda menggunakan akun root, anda dapat membahayakan sistem anda." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Standar" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Kecil" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Besar" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Teks" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informasi" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Gaya antarmuka" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Lain-lain" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Kolom:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Gambar batas di sekitar monitor" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Sembunyikan ke area notifikasi" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Peringatkan untuk mematikan tugas" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Rasio penyegaran:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Pengaturan" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Pengaturan untuk Manajer Tugas" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Tampilkan ikon aplikasi" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Tampilkan penuh baris perintah" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Tampilkan nilai dengan presisi lebih" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Gaya batang alat:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500md" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750md" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1d" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2d" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5d" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10d" -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Kendalikan proses anda" +msgstr "Tampilkan semua proses" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Rasio penyegaran" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Bita Virtual" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" +msgstr "Bita Pribadi" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "Andhika Padmawan , 2008" - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" #~ msgid "Control your processes" #~ msgstr "Kendalikan proses anda" @@ -243,9 +370,6 @@ #~ msgid "Cpu usage" #~ msgstr "Penggunaan cpu" -#~ msgid "Memory usage" -#~ msgstr "Penggunaan memori" - #~ msgid "Command" #~ msgstr "Perintah" diff -Nru xfce4-taskmanager-1.0.0/po/is.po xfce4-taskmanager-1.0.1/po/is.po --- xfce4-taskmanager-1.0.0/po/is.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/is.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,352 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Sveinn í Felli , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Apps\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-09-25 09:35+0000\n" +"Last-Translator: Sveinn í Felli \n" +"Language-Team: Icelandic (http://www.transifex.com/projects/p/xfce/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" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Verkefnastjóri" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Einfaldur og auðveldur verkefnastjóri" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Keyrsluvilla" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Fann engar sjálfgefnar skipanir til að keyra." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Keyra verkefnastjórann sem kerfisstjóri" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Keyra forrit..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Forritaleit" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Skjáhermir" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Ferlar: %u\nÖrgjörvi: %.0f%%\nVinnsluminni: %.0f%%\nDiskminni: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Ferlar: %u\nÖrgjörvi: %.0f%%\nVinnsluminni: %.0f%%\nDiskminni: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "Örgjörvi: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Vinnsluminni: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Diskminni: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "Ferlar: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "Verk" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "Staða" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "CPU" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "Forg." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "Hætta við verkefni" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "Kála verkefni" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "Ertu viss um að þú viljir senda merki til PID %d?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "Villa við að senda merki" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Villa kom upp við að senda merki til PID %d. Líklegast er að þú hafir ekki nægilegar heimildir til þess." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "Villa við að stilla forgang" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "Villa kom upp við að senda breytingu á forgangi til PID %d. Líklegast er að þú hafir ekki nægilegar heimildir til þess." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Ljúka" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "Stöðva" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "Halda áfram" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "Slátra" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "Mjög lágur" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "Lágur" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "Venjulegur" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "Hár" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "Mjög hár" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "Forgangur" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Sveinn í Felli - sveinki@nett.is" + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Viðvörun, þú ert að nota kerfisstjóraaðganginn (root), þú getur skaðað kerfið þitt." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Sjálfgefið" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Lítill" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Stór" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Texti" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Stillingar verkefnastjóra" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Sýna táknmyndir forrita" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Birta heilar skipanalínur" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Birta gildi með meiri nákvæmni" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Teikna jaðar í kringum mæla" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Stíll áhaldastiku:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Stíll viðmóts" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Spyrja hvort loka eigi verkum" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Fela á tilkynningasvæði" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Ýmislegt" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Uppfærslutíðni:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Dálkar:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Upplýsingar" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Stillingar" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500msek" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750msek" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1sek" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2sek" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5sek" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10sek" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "Sýna alla ferla" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Uppfærslutíðni" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "Sýndarbæti" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "Einkabæti" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/it.po xfce4-taskmanager-1.0.1/po/it.po --- xfce4-taskmanager-1.0.0/po/it.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/it.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,250 +1,367 @@ -# Italian translations for xfce package. -# Copyright (C) 2007 THE xfce'S COPYRIGHT HOLDER +# Italian translations for xfce task manager package. +# Copyright (C) 2007 THE xfce task manager'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce package. # Fabio Riga , 2007. -# Cristian Marchi , 2009 -# +# Cristian Marchi , 2009, 2010 +# msgid "" msgstr "" "Project-Id-Version: xfce 4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" -"PO-Revision-Date: 2009-11-21 08:10+0100\n" +"POT-Creation-Date: 2010-10-04 17:56+0000\n" +"PO-Revision-Date: 2010-09-30 14:05+0100\n" "Last-Translator: Cristian Marchi \n" -"Language-Team: Italian Translation Team \n" +"Language-Team: Italian Translation Team \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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +# GLOSSARIO +# kill = interrompi +# term = termina +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4-Taskmanager è un gestore dei processi facile da usare" +msgstr "Gestore dei processi di semplice utilizzo" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:366 ../src/process-tree-view.c:381 +#: ../src/process-tree-view.c:400 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Xfce4 Taskmanager" +msgstr "Gestore dei processi" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Errore di esecuzione" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Impossibile trovare un comando predefinito da eseguire." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Esegui il gestore dei processi come root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Esegui programma..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Ricerca applicazione" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulatore di terminale" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "Xterm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processi: %u\n" +"CPU: %.0f%%\n" +"Memoria: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processi: %u\n" +"CPU: %.0f%%\n" +"Memoria: %.0f%%\n" +"Swap: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Memoria: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Swap: %s%%" + +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Processi: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:126 msgid "Task" -msgstr "" +msgstr "Processo" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:137 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:145 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:153 ../src/settings-tool-button.c:176 msgid "State" msgstr "Stato" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:162 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:170 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:178 ../src/settings-tool-button.c:179 msgid "UID" msgstr "PID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:186 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "% CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:195 msgid "Prio." -msgstr "Prio" +msgstr "Prio." -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:363 msgid "Terminate task" -msgstr "Terminare davvero il processo?" +msgstr "Terminazione del processo" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:363 msgid "Kill task" -msgstr "Interrompi" +msgstr "Interruzione del processo" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:365 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Inviare davvero il segnale al PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:377 msgid "Error sending signal" -msgstr "" +msgstr "Errore nell'invio del segnale" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:379 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "Si è verificato un errore inviando il segnale al PID %d. Sembra che non si sia in possesso dei privilegi richiesti." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:397 msgid "Error setting priority" -msgstr "" +msgstr "Errore nell'impostare la priorità" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:398 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "Si è verificato un errore inviando impostando la priorità del PID %d. Sembra che non si sia in possesso dei privilegi richiesti." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:414 msgid "Terminate" msgstr "Termina" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:421 msgid "Stop" msgstr "Ferma" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:428 msgid "Continue" -msgstr "Continua" +msgstr "Riprendi" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:434 msgid "Kill" msgstr "Interrompi" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:441 msgid "Very low" -msgstr "" +msgstr "Molto bassa" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:446 msgid "Low" -msgstr "" +msgstr "Bassa" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:451 msgid "Normal" -msgstr "" +msgstr "Normale" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:456 msgid "High" -msgstr "" +msgstr "Alta" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:461 msgid "Very high" -msgstr "" +msgstr "Molto alta" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:466 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Priorità" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" +#: ../src/process-window.c:312 +msgid "translator-credits" msgstr "" +"Fabio Riga\n" +"Cristian Marchi, 2009, 2010" -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Autore originale:" - -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Termina" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Attenzione, si sta utilizzando l'account root: si potrebbe danneggiare il sistema." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Predefinito" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Piccolo" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Grande" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Testo" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informazioni" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Stile dell'interfaccia" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Varie" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Colonne:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Disegna i bordi" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Nascondi nell'area di notifica" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Chiedi conferma per terminare i processi" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Frequenza di aggiornamento:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Impostazioni" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Impostazioni per il gestore dei processi" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Mostra le icone delle applicazioni" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Mostra per intero la linea di comando" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Mostra i valori con maggiore precisione" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Stile della barra strumenti:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" -# GLOSSARIO -# kill = interrompi -# term = termina -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Controllo dei processi" +msgstr "Mostra tutti i processi" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Frequenza di aggiornamento" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Byte virtuali" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" - -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "" -"Fabio Riga\n" -"Cristian Marchi, 2009" +msgstr "Byte privati" -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" - -# GLOSSARIO -# kill = interrompi -# term = termina -#~ msgid "Control your processes" -#~ msgstr "Controllo dei processi" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" #~ msgid "Process manager" #~ msgstr "Gestore dei processi" -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Xfce4 Taskmanager" - #~ msgid "Really kill the task?" #~ msgstr "Interrompere davvero il processo?" @@ -254,9 +371,6 @@ #~ msgid "Cpu usage" #~ msgstr "Utilizzo della CPU" -#~ msgid "Memory usage" -#~ msgstr "Utilizzo di memoria" - #~ msgid "Command" #~ msgstr "Comando" @@ -283,3 +397,6 @@ #~ msgid "more details" #~ msgstr "Maggiori dettagli" + +#~ msgid "Xfce4 Taskmanager" +#~ msgstr "Gestore dei processi" diff -Nru xfce4-taskmanager-1.0.0/po/ja.po xfce4-taskmanager-1.0.1/po/ja.po --- xfce4-taskmanager-1.0.0/po/ja.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/ja.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,18 +1,17 @@ -# $Id$ -# # Japanese translations for xfce4-taskmanager package. -# Copyright (C) 2005-2006 Johannes Zellner. +# Copyright (C) 2005-2012 Johannes Zellner. # This file is distributed under the same license as # the xfce4-taskmanager package. # Daichi Kawahata , 2006. # Nobuhiro Iwamatsu , 2008. +# Masato Hashimoto , 2010-2012. # msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 21:39+0900\n" -"PO-Revision-Date: 2010-05-24 21:39+0900\n" +"POT-Creation-Date: 2012-04-15 15:41+0900\n" +"PO-Revision-Date: 2012-04-23 20:44+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -20,91 +19,148 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "タスクマネージャー" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "使いやすいタスクマネージャ" +msgstr "使いやすいタスクマネージャーです" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 -msgid "Task Manager" -msgstr "タスクマネージャ" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "実行エラー" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "起動するデフォルトコマンドが見つかりませんでした。" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "タスクマネージャーを root で起動" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "プログラムの実行..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "アプリケーションファインダー" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "ターミナルエミュレーター" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"プロセス数: %u\n" +"CPU: %.0f%%\n" +"メモリ: %.0f%%\n" +"スワップ: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"プロセス数: %u\n" +"CPU: %.0f%%\n" +"メモリ: %.0f%%\n" +"スワップ: %.0f%%" -#: ../src/process-statusbar.c:139 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "メモリ: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "スワップ: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "プロセス: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "タスク" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "状態" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "優先度" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "タスクを終了" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "タスクを Kill" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "PID %d へシグナルを送信しますか?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "シグナル送信エラー" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "" "An error was encountered by sending a signal to the PID %d. It is likely you " @@ -112,11 +168,11 @@ msgstr "" "PID %d へのシグナル送信でエラーが発生しました。必要な権限がないと思われます。" -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "優先度設定エラー" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " @@ -124,175 +180,200 @@ msgstr "" "PID %d への優先度設定でエラーが発生しました。必要な権限がないと思われます。" -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "終了" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "停止" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "再開" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Kill" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "終了" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "とても低い" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "低い" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "通常" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "高い" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "とても高い" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "優先度" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "実行エラー" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "プログラムの実行..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "アプリケーションファインダ" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "" +"Daichi Kawahata\n" +"Nobuhiro Iwamatsu\n" +"Masato Hashimoto" -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "ターミナルエミュレータ" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "" +"警告: あなたは root アカウントを使用しており、システムに悪影響を与えるかもし" +"れません。" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/settings.c:378 +msgid "Default" +msgstr "デフォルト" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "小" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "大" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "テキスト" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "タスクマネージャーの設定" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "アプリケーションアイコンを表示する" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "完全なコマンドラインを表示する" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "より正確な値を表示する" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "モニターの枠を描画する" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "ツールバースタイル:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "インターフェイススタイル" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "タスクを終了させる時に確認する" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "ウィンドウを閉じたら通知エリアに隠す" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "その他" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "リフレッシュ間隔:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "カラム:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "情報" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "設定" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" -msgstr "500ms" +msgstr "500ミリ秒" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" -msgstr "750ms" +msgstr "750ミリ秒" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1秒" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2秒" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5秒" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10秒" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "全てのプロセスを表示する" - -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "もっと正確に" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "完全なコマンドライン" +msgstr "すべてのプロセスを表示する" -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "状態アイコンの表示" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "リフレッシュ間隔" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "仮想メモリ" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "プライベートメモリ" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "" -"Daichi Kawahata\n" -"Nobuhiro Iwamatsu\n" -"Masato Hashimoto" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"プロセス数: %u\n" -"CPU: %.0f%%\n" -"メモリ: %.0f%%\n" -"スワップ: %.0f%%" +#~ msgid "More precision" +#~ msgstr "もっと正確に" -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"プロセス数: %u\n" -"CPU: %.0f%%\n" -"メモリ: %.0f%%\n" -"スワップ: %.0f%%" +#~ msgid "Show status icon" +#~ msgstr "状態アイコンの表示" + +#~ msgid "250ms" +#~ msgstr "250ms" #~ msgid "%.2f%%" #~ msgstr "%.2f%%" @@ -301,10 +382,10 @@ #~ msgstr "プロセスをコントロールします" #~ msgid "Process manager" -#~ msgstr "プロセスマネージャ" +#~ msgstr "プロセスマネージャー" #~ msgid "Xfce4 Taskmanager" -#~ msgstr "xfce4 タスクマネージャ" +#~ msgstr "xfce4 タスクマネージャー" #~ msgid "Really kill the task?" #~ msgstr "本当にタスクを kill しますか?" @@ -325,10 +406,10 @@ #~ msgstr "VM サイズ" #~ msgid "User" -#~ msgstr "ユーザ" +#~ msgstr "ユーザー" #~ msgid "Show user tasks" -#~ msgstr "ユーザタスクを表示する" +#~ msgstr "ユーザータスクを表示する" #~ msgid "Show root tasks" #~ msgstr "ルートタスクを表示する" diff -Nru xfce4-taskmanager-1.0.0/po/kk.po xfce4-taskmanager-1.0.1/po/kk.po --- xfce4-taskmanager-1.0.0/po/kk.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/kk.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,327 +1,352 @@ -# xfce4-taskmanager to kazakh. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Baurzhan Muftakhidinov , 2010. # +# Translators: +# Baurzhan Muftakhidinov , 2010 msgid "" msgstr "" -"Project-Id-Version: trunk\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 00:53+0000\n" -"PO-Revision-Date: 2010-03-24 02:46+0600\n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-07-12 09:44+0000\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \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" +"Language: kk\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Үрдістерді басқарушысы" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Жүйе үрдістерін ыңғайлы басқару" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 -msgid "Task Manager" -msgstr "Үрдістерді басқарушысы" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Орындау қатесі" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Жөнелту үшін бастапқы команданы табу мүмкін емес." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Task Manager-ді root атынан жіберу" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Бағдарламаны жіберу..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Қолданбалар табушы" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Терминал эмуляторы" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Үрдістер: %u\nCPU: %.0f%%\nЖады: %.0f%%\nSwap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Үрдістер: %u\nCPU: %.0f%%\\Жады: %.0f%%\nSwap: %.0f%%" -#: ../src/process-statusbar.c:139 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Жады: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Swap: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Үрдістер: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Үрдіс" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Күйі" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Үрдісті аяқтау" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Үрдісті құрту" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "PID %d үшін сигналды жіберу керек екеніне сенімдісіз бе?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Сигналды жіберу қатесі" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." msgstr "PID %d үшін сигналды жіберу кезінде қате орын алған. Сізде керек рұқсаттар жоқ сияқты." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Приоритет орнату қатесі" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." msgstr "PID %d үшін приоритет орнату кезінде қате орын алған. Сізде керек рұқсаттар жоқ сияқты." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Аяқтау" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Тоқтату" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Жалғастыру" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Құрту" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Аяқтау" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Өте төмен" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Төмен" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Қалыпты" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Жоғары" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Өте жоғары" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Приоритеті" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Орындау қатесі" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Бағдарламаны жіберу..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Қолданбалар табушы" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Терминал эмуляторы" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Baurzhan Muftakhidinov 2010" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Ескерту, сіз root тіркелгісін қолданудасыз, жүйеңізге зақым келтіруге болады." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Бастапқы" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Кіші" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Үлкен" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Мәтін" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Үрдістерді басқарушысының баптаулары" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Қолданбалар таңбашаларын көрсету" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Толық командалық жолды көрсету" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Мәндерді дәлірек көрсету" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Мониторлар шектерін көрсету" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Панель стилі:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Сыртқы түрі" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Үрдістерді аяқтауды растау" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Хабарламалар сөресіне жасыру" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Әр түрлі" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Жаңарту жиілігі:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Бағандар:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Ақпарат" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Баптаулар" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250 мс" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500 мс" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750 мс" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1 с" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2 с" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5 с" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10 с" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Барлық үрдістерді көрсету" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Толығырақ ақпарат" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Толық командалық жол" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Трей таңбашасын көрсету" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Жаңарту жиілігі" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Виртуал байттар" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Меншік байттар" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "Baurzhan Muftakhidinov 2010" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu МБ" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu КБ" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu Б" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Үрдістер: %u\n" -"CPU: %.0f%%\n" -"Жады: %.0f%%\n" -"Swap: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Үрдістер: %u\n" -"CPU: %.0f%%\\Жады: %.0f%%\n" -"Swap: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "Жүйе үрдістерін басқару" - -#~ msgid "Process manager" -#~ msgstr "Үрдістерді басқарушысы" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Xfce4 Taskmanager" - -#~ msgid "Really kill the task?" -#~ msgstr "Үрдісті шынымен өлтіру керек пе?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "%d Мб қолдануда, барлығы %d Мб" - -#~ msgid "Cpu usage" -#~ msgstr "Cpu қолд." - -#~ msgid "Memory usage" -#~ msgstr "Жады қолд." - -#~ msgid "Command" -#~ msgstr "Команда" - -#~ msgid "VM-Size" -#~ msgstr "VM-Size" - -#~ msgid "User" -#~ msgstr "User" - -#~ msgid "Show user tasks" -#~ msgstr "Пайдаланушы есептері" - -#~ msgid "Show root tasks" -#~ msgstr "Әкімші есептері" - -#~ msgid "Show other tasks" -#~ msgstr "Басқа есептер" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Кэштегі жадыны бос деп көрсету" - -#~ msgid "Contributors:" -#~ msgstr "Үлесін қосқандар:" diff -Nru xfce4-taskmanager-1.0.0/po/ko.po xfce4-taskmanager-1.0.1/po/ko.po --- xfce4-taskmanager-1.0.0/po/ko.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/ko.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,379 @@ +# Korean translation for xfce4-taskmanager package. +# Copyright (C) 2005-2012 Johannes Zellner et al. +# This file is distributed under the same license as the xfce4-taskmanager package. +# Seong-ho, Cho , 2012, 2013. +# +# Please write your name and e-mail into "translator-credits" if you update this translation script. +# +# ex ) msgstr "" +# "Gil-dong Hong \n" +# "YourName Kim " +# +msgid "" +msgstr "" +"Project-Id-Version: xfce4-taskmanager.master\n" +"Report-Msgid-Bugs-To: xfce4-users-kr-i18n \n" +"POT-Creation-Date: 2012-02-26 00:54+0000\n" +"PO-Revision-Date: 2012-02-26 14:06+0900\n" +"Last-Translator: Seong-ho, Cho \n" +"Language-Team: xfce4-users-kr-i18n \n" +"Language: ko\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-Poedit-Language: Korean\n" +"X-Poedit-Country: KOREA, REPUBLIC OF\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../xfce4-taskmanager.desktop.in.h:1 +#: ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "사용하기 쉬운 작업 관리자" + +#: ../xfce4-taskmanager.desktop.in.h:2 +#: ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 +#: ../src/main.c:156 +#: ../src/process-tree-view.c:355 +#: ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 +#: ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "작업 관리자" + +#: ../src/exec-tool-button.c:87 +#: ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "실행 오류" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "실행할 기본 명령을 찾을 수 없습니다." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "루트로 작업 관리자 실행하기" + +#: ../src/exec-tool-button.c:175 +#: ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "프로그램 실행..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "프로그램 탐색기" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "터미널 에뮬레이터" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"프로세스: %u\n" +"CPU: %.0f%%\n" +"메모리: %.0f%%\n" +"스왑: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"프로세스: %u\n" +"CPU: %.0f%%\n" +"메모리: %.0f%%\n" +"스왑: %.0f%%" + +#: ../src/process-statusbar.c:148 +#: ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 +#: ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "메모리: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "스왑: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "프로세스: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "작업" + +#: ../src/process-tree-view.c:136 +#: ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 +#: ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 +#: ../src/settings-tool-button.c:176 +msgid "State" +msgstr "상태" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "VSZ" + +#: ../src/process-tree-view.c:177 +#: ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 +#: ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "CPU" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "우선순위." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "작업 중지" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "작업 죽이기" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "정말로 PID %d에게 신호를 보내시렵니까?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "신호 보내기 오류" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "PID %d에 신호를 보내는데 몇몇 오류가 발생하였습니다. 아마도 권한이 없어서 인 것 같습니다." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "우선순위 설정 오류" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "PID %d에 대한 우선순위를 설정하는데 몇몇 오류가 발생했습니다. 아마도 권한이 없어서 인 것 같습니다." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "중단" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "멈추기" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "계속" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "죽이기" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "매우 낮음" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "낮음" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "보통" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "높음" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "매우 높음" + +#: ../src/process-tree-view.c:465 +#: ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "우선순위" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Seong-ho Cho " + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "경고, 루트 계정을 사용하고 있으며, 시스템에 해를 끼칠 수 있습니다." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "기본" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "작게" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "크게" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "텍스트" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "정보" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "인터페이스 유형" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "기타" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "열:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "모니터 주변에 테두리 그리기" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "알림 영역에 숨기기" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "작업 중지 확인" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "새로고침 주기:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "설정" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "작업 관리자 설정" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "프로그램 아이콘 보기" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "전체 명령줄 보기" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "값을 더 정밀하게 보기" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "도구 모음 유형:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "모든 프로세스 보기" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "새로고침 주기" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "가상 바이트" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "개인사용 바이트" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" + diff -Nru xfce4-taskmanager-1.0.0/po/lt.po xfce4-taskmanager-1.0.1/po/lt.po --- xfce4-taskmanager-1.0.0/po/lt.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/lt.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,365 @@ +# 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. +# Algimantas Margevičius , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: task manager\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-01-29 03:48+0000\n" +"PO-Revision-Date: 2012-01-29 09:19+0200\n" +"Last-Translator: Algimantas Margevičius \n" +"Language-Team: Lietuvių <>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Lengvai naudojama užduočių tvarkyklė" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Užduočių tvarkyklė" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Vykdymo klaida" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Nepavyko rasti jokios numatytosios komandos kurią vykdyti." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Vykdyti užduočių tvarkyklę kaip root naudotojas" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Paleisti programą..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Programų paieška" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminalo emuliatorius" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesai: %u\n" +"CPU: %.0f%%\n" +"Atmintis: %.0f%%\n" +"Mainų sritis: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesai: %u\n" +"CPU: %.0f%%\n" +"Atmintis: %.0f%%\n" +"Mainų sritis: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Atmintis: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Mainų sritis(swap): %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "Procesai: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "Užduotis" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "Būsena" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "CPU" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "Prio." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "Nutraukti užduotį" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "Užbaigti užduotį" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "Ar jūs tikrai norite siųsti signalą PID %d?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "Klaida siunčiant signalą" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you " +"don't have the required privileges." +msgstr "" +"Siunčiant signalą PID %d įvyko klaida. Turbūt jūs neturite reikiamų teisių." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "Klaida nustatant prioritetą" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "" +"Nustatant prioritetą PID %d įvyko klaida. Turbūt jūs neturite reikiamų " +"teisių." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Nutraukti" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "Sustabdyti" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "Tęsti" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "Nutraukti darbą" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "Labai žemas" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "Žemas" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "Normalus" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "Aukštas" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "Labai aukštas" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "Prioritetas" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Algimantas Margevičius " + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "" +"Atsargiai, Jūs naudojatės administratoriaus paskyra, dėl to galite pakenkti " +"sistemai." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Numatyta" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Mažas" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Didelis" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Tekstas" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informacija" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Naudotojo sąsajos stilius" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Kita" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Stulpeliai:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Piešti rėmelį aplink ekranus" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Slėpti pranešimų srityje" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Klausti prieš nutraukiant užduotis" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Atnaujinimo dažnis:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Nustatymai" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Užduočių tvarkyklės nustatymai" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Rodyti programos piktogramas" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Rodyti pilnas komandines eilutes" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Rodyti tikslesnes reikšmes" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Įrankių juostos stilius:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "Rodyti visus procesus" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Atnaujinimo dažnis" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "Virtualūs baitai" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "Privatūs baitai" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/nl.po xfce4-taskmanager-1.0.1/po/nl.po --- xfce4-taskmanager-1.0.0/po/nl.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/nl.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,282 +1,353 @@ -# Dutch translations for xfce package. -# Copyright (C) 2007 THE xfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce package. -# Stephan Arts , 2007. -# Vincent , 2008. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Stephan Arts , 2007 +# Vincent , 2008 msgid "" msgstr "" -"Project-Id-Version: xfce 4-taskmanager\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" -"PO-Revision-Date: 2009-08-16 11:08-0800\n" -"Last-Translator: Auke Kok \n" -"Language-Team: Dutch \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-09-19 14:31+0000\n" +"Last-Translator: Pjotr123 \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/xfce/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" -"X-Poedit-Language: Dutch\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Taakbeheerder" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4-Taakbeheerder is een gemakkelijk te gebruiken taakbeheerder" +msgstr "Gemakkelijk te gebruiken taakbeheerder" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy -msgid "Task Manager" -msgstr "Xfce4 Taakbeheerder" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Uitvoeringsfout" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Kon geen standaardopdracht vinden om te draaien." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Draai Taakbeheerder als systeembeheerder (root)" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Draai programma..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Toepassingzoeker" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminalvenster:" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "Xterm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processen: %u\nCPU: %.0f%%\nGeheugen: %.0f%%\nWisselgeheugen: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processen: %u\nCPU: %.0f%%\nGeheugen: %.0f%%\nWisselgeheugen: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Geheugen: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Wisselgeheugen: %s%%" + +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Processen: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Taak" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Status" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio" +msgstr "Prio." -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Weet u zeker dat u deze taak wilt stoppen?" +msgstr "Beëindig taak" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Beëindigen" +msgstr "Breek taak af" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Weet u zeker dat u een signaal wil sturen naar de PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "Fout bij zenden van signaal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Er trad een fout op bij het zenden van een signaal naar de PID %d. Waarschijnlijk hebt u niet de vereiste rechten." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "Fout bij instellen prioriteit" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " "you don't have the required privileges." -msgstr "" +msgstr "Er trad een fout op bij het instellen van een prioriteit voor de PID %d. Waarschijnlijk hebt u niet de vereiste rechten." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Stoppen" +msgstr "Beëindigen" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" -msgstr "Stop" +msgstr "Stoppen" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Doorgaan" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" -msgstr "Beëindigen" +msgstr "Afbreken" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Zeer laag" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Laag" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Normaal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "Hoog" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Zeer hoog" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioriteit" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" - -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Originele Auteurs:" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Stephan Arts\nVincent\nPjotr " -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Stoppen" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Waarschuwing: u gebruikt het root-account, u kunt uw systeem beschadigen." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Standaard" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Klein" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Groot" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Tekst" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Instellingen voor Taakbeheerder" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Toon toepassingspictogrammen" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Toon volledige opdrachtregels" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Toon waarden met meer precisie" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Teken randen rond monitors" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Werkbalkstijl:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Stijl van gebruikersomgeving" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Vraag bij beëindigen van taken" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Verberg naar het meldvak" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Gemengd" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Verversingssnelheid:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Rijen:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Informatie" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Instellingen" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Controleer processen" +msgstr "Toon alle processen" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Verversingssnelheid" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Virtuele bytes" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" +msgstr "Privé-bytes" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "" -"Stephan Arts\n" -"Vincent" - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" - -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" - -#~ msgid "Control your processes" -#~ msgstr "Controleer processen" - -#~ msgid "Process manager" -#~ msgstr "Xfce4 Taakbeheerder" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Xfce4 Taakbeheerder" - -#~ msgid "Really kill the task?" -#~ msgstr "Weet u zeker dat u deze taak wilt beëindigen?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "%d van %d MB in gebruik" - -#~ msgid "Cpu usage" -#~ msgstr "CPU Gebruik" - -#~ msgid "Memory usage" -#~ msgstr "Geheugen Gebruik " +msgstr "%lu B" -#~ msgid "Command" -#~ msgstr "Commando" - -#~ msgid "VM-Size" -#~ msgstr "Virtueel geheugen grootte" - -#~ msgid "User" -#~ msgstr "Gebruiker" - -#~ msgid "Show user tasks" -#~ msgstr "Toon taken van gebruiker" - -#~ msgid "Show root tasks" -#~ msgstr "Toon taken van root" - -#~ msgid "Show other tasks" -#~ msgstr "Toon andere taken" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Toon gecached geheugen als vrij" - -#~ msgid "Contributors:" -#~ msgstr "Contributies van:" - -#~ msgid "xfce4-taskmanager" -#~ msgstr "xfce4-taakbeheer" - -#~ msgid "more details" -#~ msgstr "meer details" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/oc.po xfce4-taskmanager-1.0.1/po/oc.po --- xfce4-taskmanager-1.0.0/po/oc.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/oc.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,352 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Cedric31 , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Apps\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-12-05 17:18+0000\n" +"Last-Translator: Cedric31 \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/xfce/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Gestionari de prètzfaches" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "De bon utilizar : lo gestionari de prètzfaches" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Error d'execucion" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Impossible de trobar una comanda per defaut per executar." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Executatz lo gestionari dels prètzfaches en tant que root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Executar lo programa ..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Lista de las aplicacions" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulator de terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processus : %u\nProcessor : %.0f%%\nMemòria : %.0f%%\nFichièr d'escambi : %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Processus : %u\nProcessor : %.0f%%\nMemòria : %.0f%%\nFichièr d'escambi : %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "Processor : %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Memòria : %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Fichièr d'escambi : %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "Processus : %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "Prètzfach" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "Estat" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "Processor" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "Prio." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "Acabar lo prètzfach" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "Tuar lo prètzfach" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "Sètz segur que volètz mandar un senhal al PID %d ?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "Error de mandadís del signal" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Una error s'es produsida en mandant un signal al PID %d. Es probable qu'avètz pas los privilègis requesits." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "Error de reglatge de las prioritats" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "Una error s'es produsida en definissent una prioritat pel PID %d. Es probable qu'avètz pas los privilègis requesits." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Acabar" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "Arrestar" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "Contunhar" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "Tuar" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "Fòrça bassa" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "Bassa" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "Normala" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "Nauta" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "Fòrça nauta" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "Prioritat" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Traductor-crèdits" + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Atencion, utilizatz lo compte root, podètz damatjar vòstre sistèma." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Defaut" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Pichon" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Grand" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Tèxte" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Paramètres del gestionari de prètzfaches" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Veire las icònas de las aplicacions" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Veire las linhas de comanda completas" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Veire las valors amb mai de precision" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Traçar de bordaduras a l'entorn dels monitors" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Estil de la barra d'aisinas :" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Estil de l'interfàcia " + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Prompt per acabar de prètzfaches" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Amagar dins la zòna de notificacion" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Divèrs" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Taus de refrescament :" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Colomnas :" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Informacion" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Paramètres" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500 ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750 ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1 s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2 s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5 s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10 s" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "Afichar totes los processus" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Taus de refrescament" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "Octets virtuals" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "Octets privats" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu Mio" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu Kio" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu O" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/pl.po xfce4-taskmanager-1.0.1/po/pl.po --- xfce4-taskmanager-1.0.0/po/pl.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/pl.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,277 +1,355 @@ -# Polish translations for xfce4-taskmanager package. -# Copyright (C) 2005-2006 Johannes Zellner. -# This file is distributed under the same license as the xfce4-taskmanager package. -# Piotr Maliński , 2006. -# Piotr Sokół , 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# elder , 2013 +# Piotr Maliński , 2006 +# Piotr Sokół , 2009,2011,2013 +# Tomasz Chudyk , 2010 msgid "" msgstr "" -"Project-Id-Version: xfce4-taskmanager 0.4.0\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" -"PO-Revision-Date: 2009-03-08 14:55+0100\n" -"Last-Translator: Piotr Sokół \n" -"Language-Team: Polish\n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-07-11 09:51+0000\n" +"Last-Translator: Piotr Sokół \n" +"Language-Team: Polish \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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Menedżer zadań" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Menedżer zadań dla środowiska Xfce" +msgstr "Zarządza uruchomionymi procesami" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy -msgid "Task Manager" -msgstr "Menedżer zadań Xfce" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Błąd uruchamiania" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Nie można odnaleźć domyślnego polecenia do uruchomienia." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Uruchom program jako użytkownik root" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Polecenie..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Wyszukiwanie programów" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulator terminala" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Ilość procesów: %u\nObciążenie CPU: %.0f%%\nUżycie pamięci: %.0f%%\nUżycie pamięci wymiany: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Ilość procesów: %u\nObciążenie CPU: %.0f%%\nUżycie pamięci: %.0f%%\nUżycie pamięci wymiany: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "Obciążenie CPU: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Użycie pamięci: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Użycie pamięci wymiany: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Ilość procesów: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Polecenie" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" -msgstr "PID" +msgstr "Identyfikator" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" -msgstr "PPID" +msgstr "Identyfikator rodzica" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Stan" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "Pamięć przydzielona" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" -msgstr "RSS" +msgstr "Pamięć zajęta" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "Użytkownik" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "Obciążenie CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Priorytet" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Zakończyć zadanie?" +msgstr "Zakończ" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Zniszcz" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "Wysłać sygnał do procesu o identyfikatorze %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "Błąd wysyłania sygnału" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "Wystąpił błąd podczas wysyłania sygnału do procesu o identyfikatorze %d. Proszę sprawdzić czy bieżący użytkownik posiada odpowiednie uprawnienia." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "Błąd ustawiania priorytetu" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " "you don't have the required privileges." -msgstr "" +msgstr "Wystąpił błąd podczas zmiany priorytetu procesu o identyfikatorze %d. Proszę sprawdzić czy bieżący użytkownik posiada odpowiednie uprawnienia." -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" msgstr "Zakończ" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Zatrzymaj" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Kontynuuj" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Zniszcz" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Bardzo niski" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Niski" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Normalny" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "Wysoki" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Bardzo wysoki" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Priorytet" -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Piotr Maliński , 2006.\nTomasz Chudyk , 2010.\nPiotr Sokół , 2009, 2011." -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Twórca:" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Uwaga: używane konto należy do użytkownika root, istnieje możliwość uszkodzenia systemu." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Domyślny" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Małe ikony" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Duże ikony" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Etykiety" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Preferencje menedżera zadań Xfce" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Ikony programów" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Pełne ścieżki poleceń" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Wyświetlanie wartości z większą precyzją" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Wyświetlanie obramowań wokół wykresów" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Styl paska narzędziowego:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Styl Interfejsu" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Wyświetlanie potwierdzenia kończenia zadania" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Ukrywanie w obszarze powiadamiania" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Różne" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Tempo odświeżania:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Kolumny:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Informacja" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Preferencje" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500 ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750 ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1 s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2 s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5 s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10 s" -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Zakończ" - -#: ../src/process-window.c:271 -#, fuzzy +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Zarządza procesami" +msgstr "Wszystkie procesy" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Tempo odświeżania" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Pamięć przydzielona" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" +msgstr "Pamięć zajęta" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "" -"Piotr Maliński \n" -"Piotr Sokół " - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" - -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" - -#~ msgid "Control your processes" -#~ msgstr "Zarządza procesami" - -#~ msgid "Process manager" -#~ msgstr "Menedżer procesów" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Menedżer zadań Xfce" - -#~ msgid "Really kill the task?" -#~ msgstr "Zniszczyć zadanie?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "Używane %d MB z %d MB" - -#~ msgid "Cpu usage" -#~ msgstr "Wykorzystanie procesora" - -#~ msgid "Memory usage" -#~ msgstr "Wykorzystanie pamięci" +msgstr "%lu B" -#~ msgid "Command" -#~ msgstr "Polecenie" - -#~ msgid "VM-Size" -#~ msgstr "VM-Rozmiar" - -#~ msgid "User" -#~ msgstr "Użytkownik" - -#~ msgid "Show user tasks" -#~ msgstr "Procesy użytkownika" - -#~ msgid "Show root tasks" -#~ msgstr "Procesy roota" - -#~ msgid "Show other tasks" -#~ msgstr "Inne procesy" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Ignorowanie pamięci podręcznej" - -#~ msgid "xfce4-taskmanager" -#~ msgstr "xfce4-taskmanager" - -#~ msgid "more details" -#~ msgstr "więcej szczegółów" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/pt.po xfce4-taskmanager-1.0.1/po/pt.po --- xfce4-taskmanager-1.0.0/po/pt.po 2010-06-04 12:44:30.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/pt.po 2014-01-08 18:42:02.000000000 +0000 @@ -7,284 +7,365 @@ msgstr "" "Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 14:48+0100\n" -"PO-Revision-Date: 2010-05-25 14:47+0100\n" -"Last-Translator: Nuno Miguel \n" +"POT-Creation-Date: 2010-12-04 11:13+0000\n" +"PO-Revision-Date: 2012-01-17 12:56-0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Portuguese\n" +"X-Poedit-Country: PORTUGAL\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:392 +#: ../xfce4-taskmanager.desktop.in.h:1 +#: ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Gestor de tarefas fácil de usar" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:387 +#: ../xfce4-taskmanager.desktop.in.h:2 +#: ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 +#: ../src/main.c:156 +#: ../src/process-tree-view.c:355 +#: ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:389 +#: ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Gestor de Tarefas" +msgstr "Gestor de tarefas" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 +#: ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Erro de execução" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "O comando de execução não foi encontrado" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Executar gestor de tarefas como \"root\"" + +#: ../src/exec-tool-button.c:175 +#: ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Executar programa..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Localizar aplicações" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulador de terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processos: %u\n" +"CPU: %.0f%%\n" +"Memória: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processos: %u\n" +"CPU: %.0f%%\n" +"Memória: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/process-statusbar.c:148 +#: ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 +#: ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Memória: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Swap: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Processos: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Tarefa" -#: ../src/process-tree-view.c:116 ../src/process-window.c:327 +#: ../src/process-tree-view.c:136 +#: ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:328 +#: ../src/process-tree-view.c:144 +#: ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:329 +#: ../src/process-tree-view.c:152 +#: ../src/settings-tool-button.c:176 msgid "State" msgstr "Estado" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:332 +#: ../src/process-tree-view.c:177 +#: ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:333 +#: ../src/process-tree-view.c:185 +#: ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio." +msgstr "Prioridade" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Terminar tarefa" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Matar tarefa" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Tem a certeza que pretende enviar um sinal ao PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Erro ao enviar o sinal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" -"Ocorreu um erro ao enviar o sinal ao PID %d. É possível que não tenha os " -"privilégios necessários." +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "Ocorreu um erro ao enviar o sinal ao PID %d. É possível que não tenha os privilégios necessários" -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:386 msgid "Error setting priority" msgstr "Erro ao definir a prioridade" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:387 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" -"Ocorreu um erro ao definir a prioridade para o PID %d. É possível que não " -"tenha os privilégios necessários." +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "Ocorreu um erro ao definir a prioridade para o PID %d. É possível que não tenha os privilégios necessários" -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:403 +msgid "Terminate" +msgstr "Terminar" + +#: ../src/process-tree-view.c:410 msgid "Stop" msgstr "Parar" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:417 msgid "Continue" msgstr "Continuar" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:423 msgid "Kill" msgstr "Matar" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Terminar" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:430 msgid "Very low" msgstr "Muito baixa" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:435 msgid "Low" msgstr "Baixa" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:440 msgid "Normal" msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:445 msgid "High" msgstr "Alta" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:450 msgid "Very high" msgstr "Muito alta" -#: ../src/process-tree-view.c:312 ../src/process-window.c:334 +#: ../src/process-tree-view.c:455 +#: ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioridade" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Erro de execução" - -#: ../src/process-window.c:214 ../src/process-window.c:216 -#: ../src/process-window.c:218 -msgid "Run Program..." -msgstr "Executar Programa..." - -#: ../src/process-window.c:221 -msgid "Application Finder" -msgstr "Localizar Aplicações" - -#: ../src/process-window.c:224 -msgid "Terminal emulator" -msgstr "Emulador de terminal" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Nuno Miguel" -#: ../src/process-window.c:226 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Cuidado, está a utilizar a conta de \"root\" e pode danificar o seu sistema" + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Omissão" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Pequeno" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Grande" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Texto" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informações" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Estilo da interface" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Diversos" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Colunas:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Desenhar contornos do monitor" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Ocultar na área de notificação" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Solicitar pelo término das aplicações" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Taxa de atualização:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Definições" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Definições do gestor de tarefas" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Mostrar ícones das aplicações" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Mostrar linhas de comando detalhadas" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Mostrar valores com mais precisão" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Estilo da barra de ferramentas:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:267 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:268 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500ms" -#: ../src/process-window.c:269 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750ms" -#: ../src/process-window.c:270 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1s" -#: ../src/process-window.c:271 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2s" -#: ../src/process-window.c:272 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5s" -#: ../src/process-window.c:273 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10s" -#: ../src/process-window.c:314 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Mostrar todos os processos" -#: ../src/process-window.c:315 -msgid "More precision" -msgstr "Mais precisão" - -#: ../src/process-window.c:316 -msgid "Full command line" -msgstr "Linha de comando completa" - -#: ../src/process-window.c:317 -msgid "Show status icon" -msgstr "Mostrar ícone de estado" - -#: ../src/process-window.c:320 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" -msgstr "Taxa de actualização" +msgstr "Taxa de atualização" -#: ../src/process-window.c:330 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "Bytes Virtuais" +msgstr "\"Bytes\" virtuais" -#: ../src/process-window.c:331 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "Bytes Privados" - -#: ../src/process-window.c:395 -msgid "translator-credits" -msgstr "Nuno Miguel" +msgstr "\"Bytes\" privados" -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processos: %u\n" -"CPU: %.0f%%\n" -"Memória: %.0f%%\n" -"Swap: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processos: %u\n" -"CPU: %.0f%%\n" -"Memória: %.0f%%\n" -"Swap: %.0f%%" diff -Nru xfce4-taskmanager-1.0.0/po/pt_BR.po xfce4-taskmanager-1.0.1/po/pt_BR.po --- xfce4-taskmanager-1.0.0/po/pt_BR.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/pt_BR.po 2014-01-08 18:42:02.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 00:53+0000\n" +"POT-Creation-Date: 2011-09-13 22:20+0000\n" "PO-Revision-Date: 2008-07-31 01:01+0200\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" @@ -20,275 +20,355 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Um gerenciador de tarefas fácil de usar" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Gerenciador de tarefas" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Erro de execução" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Não foi possível encontrar um comando padrão para executar." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Executar Gerenciador de tarefas como super-usuário" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Executar programa..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Localizador de aplicativos" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulador de terminal" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processos: %u\n" +"CPU: %.0f%%\n" +"Memória: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processos: %u\n" +"CPU: %.0f%%\n" +"Memória: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Memória: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Swap: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Processos: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Tarefa" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Estado" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Terminar a tarefa" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Terminar a tarefa" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Você tem certeza que deseja enviar um sinal ao PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Erro ao enviar sinal" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." msgstr "Um erro foi encontrado ao enviar um sinal ao PID %d. É bem provavel que você não tenha os privilégios necessários." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Erro ao definir prioridade" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." msgstr "Um erro foi encontrado ao definir uma prioridade para o PID %d. É bem provavel que você não tenha os privilégios necessários." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Terminar" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Parar" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Continuar" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Matar" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Terminar" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Muito baixa" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Baixa" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Alta" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Muito alta" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioridade" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Erro de execução" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Executar programa..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Localizador de aplicativos" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Emulador de terminal" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "" +"Adriano Winter Bess\n" +"Fábio Nogueira\n" +"Og Maciel\n" +"Pablo Galletti Vieira" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Atenção, você está usando a conta de super-usuário, você pode danificar seu sistema." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Padrão" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Pequeno" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Grande" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Texto" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informação" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Estilo da interface" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Miscelânea" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Colunas:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Desenhar bordas ao redor de monitores" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Esconder na área de notificação" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Perguntar por tarefas terminando" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Taxa de atualização:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Configurações" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Configurações para o Gerenciador de tarefas" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Mostrar ícones de aplicativos" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Mostrar Linhas de comandos completa" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Mostrar valores com mais precisão" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Estilo da barra de ferramentas:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1s" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2s" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5s" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Mostrar todos processos" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Mais precisão" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Linha de comando completa" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Mostrar ícone de status" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Taxa de atualização" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Bytes virtuais" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Bytes privados" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "" -"Adriano Winter Bess\n" -"Fábio Nogueira\n" -"Og Maciel\n" -"Pablo Galletti Vieira" - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processos: %u\n" -"CPU: %.0f%%\n" -"Memória: %.0f%%\n" -"Swap: %.0f%%" +#~ msgid "250ms" +#~ msgstr "250ms" -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Processos: %u\n" -"CPU: %.0f%%\n" -"Memória: %.0f%%\n" -"Swap: %.0f%%" +#~ msgid "More precision" +#~ msgstr "Mais precisão" + +#~ msgid "Show status icon" +#~ msgstr "Mostrar ícone de status" #~ msgid "Control your processes" #~ msgstr "Controle seus processos" diff -Nru xfce4-taskmanager-1.0.0/po/ru.po xfce4-taskmanager-1.0.1/po/ru.po --- xfce4-taskmanager-1.0.0/po/ru.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/ru.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,334 +1,354 @@ -# Russian translation of xfce4-taskmanager. -# Copyright (C) 2005-2006 Johannes Zellner. -# This file is distributed under the same license as -# the xfce4-taskmanager package. -# Andrey Fedoseev , 2006. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Andrey Fedoseev , 2006 +# asvl , 2013 +# Vlad Vasilev , 2009 msgid "" msgstr "" -"Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 00:53+0000\n" -"PO-Revision-Date: 2009-10-17 23:23+0300\n" -"Last-Translator: Vlad Vasilev \n" -"Language-Team: Russian \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-09-02 19:14+0000\n" +"Last-Translator: asvl \n" +"Language-Team: Russian (http://www.transifex.com/projects/p/xfce/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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Диспетчер задач" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Простой менеджер процессов" +msgstr "Простой диспетчер задач" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 -msgid "Task Manager" -msgstr "Диспетчер задач Xfce 4" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Ошибка выполнения" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Не удалось найти ни одной команды по умолчанию для запуска." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Запустить диспетчер задач от суперпользователя" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Выполнить..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Поиск приложений" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Эмулятор терминала" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Процессов: %u\nЦП: %.0f%%\nПамять: %.0f%%\nПодкач.: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Процессов: %u\nЦП: %.0f%%\nПамять: %.0f%%\nПодкач.: %.0f%%" -#: ../src/process-statusbar.c:139 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "ЦП: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Память: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" -msgstr "Подкач.: %s%%" +msgstr "Подкачка: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Процессы: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Задача" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Состояние" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "ВРазм" +msgstr "Виртуальная" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" -msgstr "RSS" +msgstr "Резидентная" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "ЦПУ" +msgstr "ЦП" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Прио" +msgstr "Приор." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Завершить процесс" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Принудительно завершить" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Вы хотите послать сигнал процессу %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Не удалось отправить сигнал" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." msgstr "Произошла ошибка при отправке сигнала процессу %d. Вероятнее всего, у вас нет необходимых прав." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Не удалось задать приоритет" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." msgstr "Произошла ошибка при задании приоритета процесса %d. Вероятнее всего, у вас нет необходимых прав." -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Завершить" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Остановить" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Продолжить" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Убить" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "Завершить" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Очень низкий" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Низкий" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Обычный" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Высокий" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Очень высокий" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Приоритет" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Ошибка выполнения" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "Выполнить..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "Поиск приложений" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "Эмулятор терминала" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Andrey Fedoseev\nVlad Vasilev\nSergey Alyoshin" -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Внимание! Вы используете учётную запись суперпользователя, тем самым вы можете повредить систему." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "По умолчанию" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Маленький" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Большой" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Текст" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Настройки диспетчера задач" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Показывать значки приложений" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Показывать строку команд полностью" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Показывать значения с большей точностью" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Отображать рамки вокруг индикаторов" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Стиль панели инструментов:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Стиль интерфейса" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Запрашивать подтверждение при завершении задач" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Прятать в область уведомления" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Дополнительно" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Частота обновления:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Колонки:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Информация" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Настройки" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250 мс" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500 мс" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750 мс" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1 с" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2 с" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5 с" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10 с" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Показывать все процессы" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "Указать точно" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "Командная строка" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "Показывать значок" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Частота обновления" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "Вирт" +msgstr "Виртуальная память" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "Личн" - -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "Andrey Fedoseev" +msgstr "Резидентная память" -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "%lu Миб" +msgstr "%lu МиБ" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "%lu Киб" +msgstr "%lu КиБ" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "%lu б" +msgstr "%lu Б" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Процессов: %u\n" -"ЦП: %.0f%%\n" -"Память: %.0f%%\n" -"Подкач.: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Процессов: %u\n" -"ЦП: %.0f%%\n" -"Память: %.0f%%\n" -"Подкач.: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "Управление процессами" - -#~ msgid "Process manager" -#~ msgstr "Диспетчер задач Xfce 4" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Диспетчер задач Xfce 4" - -#~ msgid "Really kill the task?" -#~ msgstr "Действительно убить процесс?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "%d MB из %d MB использовано" - -#~ msgid "Cpu usage" -#~ msgstr "Использование ЦПУ" - -#~ msgid "Memory usage" -#~ msgstr "Использование памяти" - -#~ msgid "Command" -#~ msgstr "Команда" - -#~ msgid "VM-Size" -#~ msgstr "Память" - -#~ msgid "User" -#~ msgstr "Пользователь" - -#~ msgid "Show user tasks" -#~ msgstr "Показать задачи пользователя" - -#~ msgid "Show root tasks" -#~ msgstr "Показать задачи суперпользователя" - -#~ msgid "Show other tasks" -#~ msgstr "Показать другие задачи" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Показывать память используемую кэшем, как свободную" - -#~ msgid "Contributors:" -#~ msgstr "Участники:" - -#~ msgid "xfce4-taskmanager" -#~ msgstr "Диспетчер задач Xfce 4" - -#~ msgid "more details" -#~ msgstr "подробнее" diff -Nru xfce4-taskmanager-1.0.0/po/sk.po xfce4-taskmanager-1.0.1/po/sk.po --- xfce4-taskmanager-1.0.0/po/sk.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/sk.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,215 +1,376 @@ # Slovak translations for xfce4-taskmanager package. # Copyright (C) 2005-2008 Johannes Zellner. # This file is distributed under the same license as the xfce4-taskmanager package. -# +# Robert Hartl , 2009-2010. +# Tomáš Vadina , 2011. # msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager\n" -"Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" -"POT-Creation-Date: 2010-05-20 16:08+0000\n" -"PO-Revision-Date: 2010-05-21 00:44+0200\n" -"Last-Translator: Robert Hartl \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-05-20 04:18+0000\n" +"PO-Revision-Date: 2011-05-20 12:33+0100\n" +"Last-Translator: Tomáš Vadina \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 +#: ../xfce4-taskmanager.desktop.in.h:1 +#: ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Ľahko použiteľný správca úloh" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 +#: ../xfce4-taskmanager.desktop.in.h:2 +#: ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 +#: ../src/main.c:156 +#: ../src/process-tree-view.c:355 +#: ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 +#: ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Správca úloh" -#: ../src/process-statusbar.c:121 +#: ../src/exec-tool-button.c:87 +#: ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Chyba spustenia" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Nemožno nájsť žiadny predvolený príkaz na spustenie" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Spustiť Správcu úloh ako root" + +#: ../src/exec-tool-button.c:175 +#: ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Spustiť program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Vyhľadávač aplikácií" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Emulátor terminálu" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"\t\r\n" +"\r\n" +"Procesy: %u\n" +"CPU: %.0f%%\n" +"Pamäť: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Procesy: %u\n" +"CPU: %.0f%%\n" +"Pamäť: %.0f%%\n" +"Swap: %.0f%%" + +#: ../src/process-statusbar.c:148 +#: ../src/process-window.c:374 #, c-format -msgid "CPU: %.2f%%" -msgstr "CPU: %.2f%%" +msgid "CPU: %s%%" +msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:128 +#: ../src/process-statusbar.c:157 +#: ../src/process-window.c:379 #, c-format -msgid "Memory: %.2f%%" -msgstr "Pamäť: %.2f%%" +msgid "Memory: %s%%" +msgstr "Pamäť: %s%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:166 #, c-format -msgid "Swap: %.2f%%" -msgstr "Swap: %.2f%%" +msgid "Swap: %s%%" +msgstr "Swap: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Procesy: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Úloha" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 +#: ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 +#: ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 +#: ../src/settings-tool-button.c:176 msgid "State" msgstr "Stav" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 +#: ../src/process-tree-view.c:177 +#: ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 +#: ../src/process-tree-view.c:185 +#: ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Prio." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Ukončiť úlohu" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Zabiť úlohu" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Ste si istí, že chcete odoslať signál pre PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Chyba pri odosielaní signálu" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "Pri odosielaní signálu procesu s identifikátorom PID %d nastala chyba. Pravdepodobne nemáte potrebné oprávnenia." -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Chyba nastavenia priority" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "Pri nastavovaní priority procesu s identifikátorom PID %d nastala chyba. Pravdepodobne nemáte potrebné oprávnenia." -#: ../src/process-tree-view.c:260 +#: ../src/process-tree-view.c:412 msgid "Terminate" msgstr "Ukončiť" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Zastaviť" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Pokračovať" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Zabiť" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Veľmi nízka" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Nízka" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Normálna" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Vysoká" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Veľmi vysoká" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 +#: ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Priorita" -#: ../src/process-window.c:197 -msgid "Execution error" +#: ../src/process-window.c:312 +msgid "translator-credits" msgstr "" +"Robert Hartl , 2010.\n" +"Tomáš Vadina , 2011." -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "Spustiť program..." - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "Vyhľadávač aplikácií" - -#: ../src/process-window.c:228 -msgid "Terminal emulator" -msgstr "Emulátor terminálu" - -#: ../src/process-window.c:229 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Pozor, používate účet root, môžete poškodiť svoj systém." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Predvolené" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Malé" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Veľké" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Text" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Informácie" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Štýl rozhrania" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Rôzne" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Stĺpce:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Vykresľovať okraje okolo monitorov" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Skryť do oznamovacej oblasti" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Pýtať sa na ukončovanie úloh" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Obnovovacia frekvencia" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Nastavenia" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Nastavenia pre Správcu úloh" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Zobraziť ikony aplikácií" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Zobrazovať celé riadky príkazov" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Zobrazovať hodnoty s väčšou presnosťou" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Štýl panelu nástrojov" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "" +"\t\r\n" +"\r\n" +"500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" -#: ../src/process-window.c:271 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Zobraziť všetky procesy" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Obnovovacia frekvencia" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "Virtuálne bajty" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" +msgstr "Súkromné bajty" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "Robert Hartl , 2010." - -#: ../src/task-manager.c:120 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:127 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:131 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:142 +#: ../src/task-manager.c:263 #, c-format -msgid "%.2f%%" -msgstr "%.2f%%" +msgid "%s%%" +msgstr " %s%%" + diff -Nru xfce4-taskmanager-1.0.0/po/sl.po xfce4-taskmanager-1.0.1/po/sl.po --- xfce4-taskmanager-1.0.0/po/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/sl.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,352 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# anthonmanix , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Apps\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-11-28 20:42+0000\n" +"Last-Translator: anthonmanix \n" +"Language-Team: Slovenian (http://www.transifex.com/projects/p/xfce/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" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Upravljalnik nalog" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Enostaven upravljalnik nalog" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Napaka izvajanja" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Zaženi upravljalnik nalog kot skrbnik" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Zaženi program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Opravila: %u\nCPU: %.0f%%\nPomnilnik: %.0f%%\nIzmenjevalni razdelek: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Pomnilnik: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Izmenjevalni razdelek: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "Opravila: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "Naloga" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "Stanje" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "CPU" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "Predn." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "Uniči nalogo" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "Uniči nalogo" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "Napaka pri pošiljanju signala" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "" + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "" + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Uniči" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "Zaustavi" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "Nadaljuj" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "Uniči" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "Zelo nizka" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "Nizka" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "Normalna" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "Visoka" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "Zelo visoka" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "Prednost" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "" + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "" + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Privzeto" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Majhno" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Veliko" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Besedilo" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Prikaži ikone programov" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Prikaži vrednosti z večjo natančnostjo" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Slog orodne vrstice:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Slog vmesnika" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Hitrost osveževanja:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Stolpci:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Nastavitve" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "Prikaži vsa opravila" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Hitrost osveževanja" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/sr.po xfce4-taskmanager-1.0.1/po/sr.po --- xfce4-taskmanager-1.0.0/po/sr.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/sr.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,366 @@ +# 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. +# Саша Петровић , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: мастер\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-03-06 17:09+0000\n" +"PO-Revision-Date: 2013-01-23 18:57+0200\n" +"Last-Translator: Саша Петровић \n" +"Language-Team: српски \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \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" +"X-Generator: Gtranslator 2.91.5\n" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "Управник задатака лак за коришћење" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Управник задатака" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Грешка при извршавању" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Нисам успео да пронађем ни једну почетну наредбу за покретање." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Покрени Управника задатака као корени корисник" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Покрени програм..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Проналазач програма" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Опонашач терминала" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "ИксТерм" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Процеси: %u\n" +"Процесор: %.0f%%\n" +"Меморија: %.0f%%\n" +"Помоћна меморија: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Процеси: %u\n" +"Процесор: %.0f%%\n" +"Меморија: %.0f%%\n" +"Помоћна меморија: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "Процесор: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Меморија: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Помоћна меморија: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "Процеси: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "Задатак" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "ПИД" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "ППИД" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "Стање" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "ВСЗ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "РСС" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "ЈИБ" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "Процесор" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "Предност" + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "Окончај задатак" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "Убиј задатак" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "Да ли сте сигурни да желите послати сигнал ПИДу %d?" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "Грешка приликом слања сигнала" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you " +"don't have the required privileges." +msgstr "" +"Јавила се грешка приликом слања сигнала ПИД-у %d. Вероватно немате захтевана " +"овлашћења." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "Грешка подешавања предности" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "" +"Јавила се грешка приликом одређивања предности ПИД-у %d.Вероватно немате " +"захтевана овлашћења." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Окончај" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "Заустави" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "Настави" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "Убиј" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "Врло низак" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "Низак" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "Обичан" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "Висок" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "Врло висок" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "Предност" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Саша Петровић " + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "" +"Упозорење, користите администраторски налог можете оштетити ваш систем." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Подразумевано" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "мали" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "велики" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Текст" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Обавештења" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Изглед сучеља" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Остало" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Ступци:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Цртај оквире око надгледача" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Сакриј у обавештајну област" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Питај за обуставу задатака" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Учесталост освежавања:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Подешавања" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Подеешавања управника задатака" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Прикажи иконице програма" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Прикажи пуну наредбену линију" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Прикажи вредности са више одређености" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Изглед траке алата:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "Прикажи све процесе" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Учесталост освежавања" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "Нстварни бајтови" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "Приватни бајтови" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/sv.po xfce4-taskmanager-1.0.1/po/sv.po --- xfce4-taskmanager-1.0.0/po/sv.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/sv.po 2014-01-08 18:42:02.000000000 +0000 @@ -2,12 +2,12 @@ # Copyright (C) 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the xfce4-taskmanager package. # Daniel Nylander , 2008. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" +"POT-Creation-Date: 2010-12-18 17:15+0000\n" "PO-Revision-Date: 2009-12-16 18:07+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -15,219 +15,348 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "Xfce4-Taskmanager är en lättanvänd aktivitetshanterare" +msgstr "Lättanvänd aktivitetshanterare" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "Xfce4 Aktivitetshanterare" +msgstr "Aktivitetshanterare" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Körningsfel" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Kunde inte hitta något standardkommando att köra." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Kör Aktivitetshanterare som root" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Kör program..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Programlista" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminalemulator" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" -#: ../src/process-statusbar.c:121 +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processer: %u\n" +"Processor: %.0f%%\n" +"Minne: %.0f%%\n" +"Växlingsutrymme: %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"Processer: %u\n" +"Processor: %.0f%%\n" +"Minne: %.0f%%\n" +"Växlingsutrymme: %.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "Processor: %s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Minne: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Växlingsutrymme: %s%%" + +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "Processer: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "Aktivitet" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Tillstånd" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "Processor%" +msgstr "Processor" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 -#, fuzzy +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "Prio" +msgstr "Prio." -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "Verkligen terminera aktiviteten?" +msgstr "Terminera processen" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "Döda" +msgstr "Döda processen" -#: ../src/process-tree-view.c:214 -#, fuzzy, c-format +#: ../src/process-tree-view.c:354 +#, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "Kunde inte skicka signal till aktiviteten med ID %d" +msgstr "Är du säker på att du vill skicka en signal till PID %d?" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." msgstr "" -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." msgstr "" -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Term" +msgstr "Terminera" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Stoppa" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Fortsätt" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Döda" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "Mycket låg" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "Låg" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "Normal" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "Hög" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "Mycket hög" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Prioritet" -#: ../src/process-window.c:197 -msgid "Execution error" +#: ../src/process-window.c:312 +msgid "translator-credits" msgstr "" +"Daniel Nylander \n" +"\n" +"Skicka synpunkter på översättningen till\n" +"" -#: ../src/process-window.c:226 -msgid "Run Program..." +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." msgstr "" -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" +#: ../src/settings.c:378 +msgid "Default" +msgstr "Standard" -#: ../src/process-window.c:228 -#, fuzzy -msgid "Terminal emulator" -msgstr "Ursprunglig upphovsman:" +#: ../src/settings.c:379 +msgid "Small" +msgstr "Liten" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Stor" -#: ../src/process-window.c:229 +#: ../src/settings.c:381 #, fuzzy -msgid "XTerm" -msgstr "Term" +msgid "Text" +msgstr "Text" -#: ../src/process-window.c:271 +#: ../src/settings-dialog.ui.h:1 #, fuzzy +msgid "Information" +msgstr "Information" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Diverse" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Kolumner:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Uppdateringsfrekvens:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Inställningar" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Inställningar för Aktivitetshanterare" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Visa programikoner" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Visa fullständiga kommandorader" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" + +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "Kontrollera dina processer" +msgstr "Visa alla processer" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "Uppdateringsfrekvens" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "" -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "" -"Daniel Nylander \n" -"\n" -"Skicka synpunkter på översättningen till\n" -"" - -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 -#, fuzzy, c-format -msgid "%.2f%%" -msgstr "%0.0f %%" +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" #~ msgid "Control your processes" #~ msgstr "Kontrollera dina processer" @@ -247,9 +376,6 @@ #~ msgid "Cpu usage" #~ msgstr "Processoranvändning" -#~ msgid "Memory usage" -#~ msgstr "Minnesanvändning" - #~ msgid "Command" #~ msgstr "Kommando" diff -Nru xfce4-taskmanager-1.0.0/po/te.po xfce4-taskmanager-1.0.1/po/te.po --- xfce4-taskmanager-1.0.0/po/te.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/te.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,358 @@ +# Telugu Translation for Xfce Taskmanager. +# Copyright (C) 2012 e-telugu Localization Team +# This file is distributed under the same license as the Xfce Task manager package. +# Praveen Illa , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: Xfce taskmanager.master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-03-11 14:30+0000\n" +"PO-Revision-Date: 2012-03-12 00:22+0530\n" +"Last-Translator: Praveen Illa \n" +"Language-Team: Telugu \n" +"Language: \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" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "వాడుటకు సరళమైన కర్తవ్య నిర్వాహకం" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "కర్తవ్య నిర్వాహకం" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "అమలులో దోషం" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "కర్తవ్య నిర్వాహకాన్ని రూట్ వలె నడుపు" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "కార్యక్రమాన్ని నడుపు..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "అనువర్తనము కనుగొనునది" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "టెర్మినల్ ఎమ్యులేటర్" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "ఎక్స్ టెర్మ్" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"ప్రక్రియలు: %u\n" +"సిపియు: %.0f%%\n" +"జ్ఞాపకశక్తి: %.0f%%\n" +"స్వాప్: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"ప్రక్రియలు: %u\n" +"సిపియు: %.0f%%\n" +"జ్ఞాపకశక్తి: %.0f%%\n" +"స్వాప్: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "సిపియు: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "జ్ఞాపకశక్తి: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "స్వాప్:: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "ప్రక్రియలు: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "కర్తవ్యం" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "స్థితి" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "సిపియు" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "ప్రాముఖ్యత" + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "కర్తవ్యాన్ని ముగించు" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "కర్తవ్యాన్ని అంతంచేయి" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you " +"don't have the required privileges." +msgstr "" + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "" + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "ముగించు" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "ఆపివేయి" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "కొనసాగించు" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "అంతంచేయి" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "మరీ తక్కువ" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "తక్కువ" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "సాధారణం" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "ఎక్కువ" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "మరీ ఎక్కువ" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "ప్రాముఖ్యత" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Praveen Illa , 2012" + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "" + +#: ../src/settings.c:378 +msgid "Default" +msgstr "అప్రమేయం" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "చిన్న" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "పెద్ద" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "పాఠ్యం" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "సమాచారము" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "అంతరవర్తి శైలి" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "ఇతరాలు" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "నిలువువరుసలు:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "తాజాకరణ రేటు:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "అమరికలు" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "కర్తవ్య నిర్వాహకము అమరికలు" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "అనువర్తనాల ప్రతీకలను చూపించు" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "పూర్తి ఆదేశ వరుసలను చూపించు" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "సాధనపట్టీ శైలి:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500ms" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750ms" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1s" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2s" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5s" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10s" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "అన్ని ప్రక్రియలను చూడండి" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "తాజాకరణ రేటు" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "వర్ట్యువల్ బైట్లు" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "ప్రైవేట్ బైట్లు" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/tr.po xfce4-taskmanager-1.0.1/po/tr.po --- xfce4-taskmanager-1.0.0/po/tr.po 2010-06-01 23:02:40.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/tr.po 2014-01-08 18:42:02.000000000 +0000 @@ -3,292 +3,362 @@ msgstr "" "Project-Id-Version: xfce4 taskmanager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-31 16:08+0000\n" +"POT-Creation-Date: 2011-01-12 17:15+0000\n" "PO-Revision-Date: 2010-05-31 21:11+0300\n" "Last-Translator: Ayhan YALÇINSOY \n" "Language-Team: Turkish \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-Poedit-Country: TURKEY\n" "X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=1; plural=0;\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:395 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Kullanımı kolay görev yöneticisi" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:284 -#: ../src/process-tree-view.c:298 ../src/process-tree-view.c:316 -#: ../src/process-window.c:177 ../src/process-window.c:390 ../src/main.c:116 +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" msgstr "Görev Yöneticisi" -#: ../src/process-statusbar.c:139 +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Başlatıcı hatası" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Çalıştırmak için komut bulunamadı" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Yönetici olarak çalıştır" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Program Çalıştır" + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Uygulama Bulucu" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Terminal öykünücüsü" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"İşlem: %u\n" +"İşlemci: %.0f%%\n" +"Bellek: %.0f%%\n" +"Takas Alanı: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"İşlem: %u\n" +"İşlemci: %.0f%%\n" +"Bellek: %.0f%%\n" +"Takas Alanı: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "İşlemci : %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Bellek : %sf%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Takas Alanı: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "İşlemler : %d" -#: ../src/process-tree-view.c:115 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Görev" -#: ../src/process-tree-view.c:125 ../src/process-window.c:330 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:133 ../src/process-window.c:331 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:141 ../src/process-window.c:332 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Durum" -#: ../src/process-tree-view.c:150 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:158 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:166 ../src/process-window.c:335 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:174 ../src/process-window.c:336 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:183 +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Öncelik" -#: ../src/process-tree-view.c:281 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Süreci sonlandır" -#: ../src/process-tree-view.c:281 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Süreci öldür" -#: ../src/process-tree-view.c:283 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "PID %d için sinyal göndermek istediğinize emin misiniz?" -#: ../src/process-tree-view.c:294 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Sinyal gönderme hatası" -#: ../src/process-tree-view.c:296 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" -"PID %d için sinyal gönderilirken beklenmeyen hata oluştu. Muhtemelen gereken " -"izinlere sahip değilsiniz." +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "PID %d için sinyal gönderilirken beklenmeyen hata oluştu. Muhtemelen gereken izinlere sahip değilsiniz." -#: ../src/process-tree-view.c:313 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Öncelik ayarlama hatası" -#: ../src/process-tree-view.c:314 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" -"PID %d için öncelik atarken beklenmeyen hata oluştu. Muhtemelen gereken " -"izinlere sahip değilsiniz." +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "PID %d için öncelik atarken beklenmeyen hata oluştu. Muhtemelen gereken izinlere sahip değilsiniz." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Sonlandır" -#: ../src/process-tree-view.c:331 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Durdur" -#: ../src/process-tree-view.c:338 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Devam et" -#: ../src/process-tree-view.c:344 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Sonlandır" -#: ../src/process-tree-view.c:349 -msgid "Terminate" -msgstr "Sonlandır" - -#: ../src/process-tree-view.c:356 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Çok düşük" -#: ../src/process-tree-view.c:361 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Düşük" -#: ../src/process-tree-view.c:366 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Normal" -#: ../src/process-tree-view.c:371 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Yüksek" -#: ../src/process-tree-view.c:376 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Çok yüksek" -#: ../src/process-tree-view.c:381 ../src/process-window.c:337 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Öncelik" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Başlatıcı hatası" - -#: ../src/process-window.c:214 ../src/process-window.c:216 -#: ../src/process-window.c:218 -msgid "Run Program..." -msgstr "Program Çalıştır" - -#: ../src/process-window.c:221 -msgid "Application Finder" -msgstr "Uygulama Bulucu" - -#: ../src/process-window.c:224 -msgid "Terminal emulator" -msgstr "Terminal öykünücüsü" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Samed Beyribey , 2008 Ayhan YALÇINSOY,2010" -#: ../src/process-window.c:226 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Root hesabı kullanmaktasınız, sisteminize zarar verebilirsiniz." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Öntanımlı" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Küçük" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Büyük" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Metin" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "Bilgi" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "Arayüz Stili" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "Çeşitli" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "Kolonlar:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Ekranların çevresine çerçeve çiz" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "Bildirim alanında sakla" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "Görevleri sonlandırmadan önce sor" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "Yenileme oranı" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "Ayarlar" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "Görev Yöneticisi Ayarları" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "Uygulama ikonlarını göster." + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "Tam komut satırını göster" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "Değerleri daha hassas göster" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "Araç çubğu stili:" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:270 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:271 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500ms" -#: ../src/process-window.c:272 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750ms" -#: ../src/process-window.c:273 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1s" -#: ../src/process-window.c:274 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2s" -#: ../src/process-window.c:275 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5s" -#: ../src/process-window.c:276 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10s" -#: ../src/process-window.c:317 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Tüm işlemleri göster" -#: ../src/process-window.c:318 -msgid "More precision" -msgstr "Daha hassas" - -#: ../src/process-window.c:319 -msgid "Full command line" -msgstr "Tam komut satırı" - -#: ../src/process-window.c:320 -msgid "Show status icon" -msgstr "Durum simgesini göster" - -#: ../src/process-window.c:323 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Oranı yenile" -#: ../src/process-window.c:333 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Sanal Bitler" -#: ../src/process-window.c:334 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Özel Bitler" -#: ../src/process-window.c:398 -msgid "translator-credits" -msgstr "" -"Samed Beyribey , 2008 " -"Ayhan YALÇINSOY,2010" - -#: ../src/task-manager.c:191 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:198 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:202 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:218 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"İşlem: %u\n" -"İşlemci: %.0f%%\n" -"Bellek: %.0f%%\n" -"Takas Alanı: %.0f%%" +#~ msgid "250ms" +#~ msgstr "250ms" -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"İşlem: %u\n" -"İşlemci: %.0f%%\n" -"Bellek: %.0f%%\n" -"Takas Alanı: %.0f%%" +#~ msgid "More precision" +#~ msgstr "Daha hassas" + +#~ msgid "Show status icon" +#~ msgstr "Durum simgesini göster" #~ msgid "Control your processes" #~ msgstr "Süreçlerinizi kontrol edin" diff -Nru xfce4-taskmanager-1.0.0/po/ug.po xfce4-taskmanager-1.0.1/po/ug.po --- xfce4-taskmanager-1.0.0/po/ug.po 2010-05-27 15:54:39.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/ug.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,289 +1,355 @@ -# $Id$ -# -# Uyghur translations for xfce4-taskmanager package. -# Copyright (C) 2005-2006 Johannes Zellner. -# This file is distributed under the same license as -# the xfce4-taskmanager package. -# Gheyret T.Kenji , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-27 04:08+0000\n" -"PO-Revision-Date: 2010-05-11 23:00+0900\n" -"Last-Translator: Gheyret T.Kenji \n" -"Language-Team: Uyghur Computer Science Association \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:392 -msgid "Easy to use task manager" -msgstr "ئىشلىتىشكە ئەپلىك ۋەزىپە باشقۇرغۇ" - -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:218 -#: ../src/process-tree-view.c:232 ../src/process-tree-view.c:250 -#: ../src/process-window.c:177 ../src/process-window.c:387 -msgid "Task Manager" -msgstr "ۋەزىپە باشقۇرغۇ" - -#: ../src/process-statusbar.c:139 -msgid "CPU: %s%%" -msgstr "CPU: %.2f%%" - -#: ../src/process-statusbar.c:148 -msgid "Memory: %s%%" -msgstr "ئەسلەك: %.2f%%" - -#: ../src/process-statusbar.c:157 -msgid "Swap: %s%%" -msgstr "Swap: %.2f%%" - -#: ../src/process-statusbar.c:172 -#, c-format -msgid "Processes: %d" -msgstr "Processes: %d" - -#: ../src/process-tree-view.c:108 -msgid "Task" -msgstr "ۋەزىپە" - -#: ../src/process-tree-view.c:118 ../src/process-window.c:327 -msgid "PID" -msgstr "PID" - -#: ../src/process-tree-view.c:126 ../src/process-window.c:328 -msgid "PPID" -msgstr "PPID" - -#: ../src/process-tree-view.c:134 ../src/process-window.c:329 -msgid "State" -msgstr "ھالەت" - -#: ../src/process-tree-view.c:143 -msgid "VSZ" -msgstr "VSZ" - -#: ../src/process-tree-view.c:151 -msgid "RSS" -msgstr "RSS" - -#: ../src/process-tree-view.c:159 ../src/process-window.c:332 -msgid "UID" -msgstr "UID" - -#: ../src/process-tree-view.c:167 ../src/process-window.c:333 -msgid "CPU" -msgstr "CPU" - -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:176 -msgid "Prio." -msgstr "Prio." - -#: ../src/process-tree-view.c:215 -msgid "Terminate task" -msgstr "ۋەزىپىنى ئاخىرلاشتۇر" - -#: ../src/process-tree-view.c:215 -msgid "Kill task" -msgstr "ۋەزىپىنى ئولتۇر" - -#: ../src/process-tree-view.c:217 -#, c-format -msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "PID %d غا راستلا سىگنال ئەۋەتەمدۇ؟" - -#: ../src/process-tree-view.c:228 -msgid "Error sending signal" -msgstr "سىگنال ئەۋەتىشتە خاتالىق كۆرۈلدى" - -#: ../src/process-tree-view.c:230 -#, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" -"PID %d غا سىگنال ئەۋەتىشتە خاتالىق كۆرۈلدى. سەۋەبى سىزنىڭ ھوقۇقىڭىز يېتەرلىك " -"ئەمەستەك قىلىدۇ." - -#: ../src/process-tree-view.c:247 -msgid "Error setting priority" -msgstr "priority نى بەلگىلەشتە خاتالىق كۆرۈلدى" - -#: ../src/process-tree-view.c:248 -#, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" -"PID %d نىڭ priority نى بەلگىلەشتە خاتالىق كۆرۈلدى. سەۋەبى سىزنىڭ ھوقۇقىڭىز " -"يېتەرلىك ئەمەستەك قىلىدۇ." - -#: ../src/process-tree-view.c:265 -msgid "Stop" -msgstr "توختا" - -#: ../src/process-tree-view.c:272 -msgid "Continue" -msgstr "داۋاملاشتۇر" - -#: ../src/process-tree-view.c:278 -msgid "Kill" -msgstr "ئولتۇر" - -#: ../src/process-tree-view.c:283 -msgid "Terminate" -msgstr "ئاخىرلاشتۇر" - -#: ../src/process-tree-view.c:290 -msgid "Very low" -msgstr "بەك تۆۋەن" - -#: ../src/process-tree-view.c:295 -msgid "Low" -msgstr "تۆۋەن" - -#: ../src/process-tree-view.c:300 -msgid "Normal" -msgstr "نورمال" - -#: ../src/process-tree-view.c:305 -msgid "High" -msgstr "يۇقىرى" - -#: ../src/process-tree-view.c:310 -msgid "Very high" -msgstr "بەك يۇقىرى" - -#: ../src/process-tree-view.c:315 ../src/process-window.c:334 -msgid "Priority" -msgstr "ئالدىنلىق" - -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "ئىجرا خاتالىقى" - -#: ../src/process-window.c:214 ../src/process-window.c:216 -#: ../src/process-window.c:218 -msgid "Run Program..." -msgstr "پروگرامما ئىجرا قىلىش..." - -#: ../src/process-window.c:221 -msgid "Application Finder" -msgstr "پروگرامما ئىزدىگۈ" - -#: ../src/process-window.c:224 -msgid "Terminal emulator" -msgstr "تېرمىنال emulator" - -#: ../src/process-window.c:226 -msgid "XTerm" -msgstr "XTerm" - -#. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:267 -msgid "250ms" -msgstr "250ms" - -#: ../src/process-window.c:268 -msgid "500ms" -msgstr "500ms" - -#: ../src/process-window.c:269 -msgid "750ms" -msgstr "750ms" - -#: ../src/process-window.c:270 -msgid "1s" -msgstr "1s" - -#: ../src/process-window.c:271 -msgid "2s" -msgstr "2s" - -#: ../src/process-window.c:272 -msgid "5s" -msgstr "5s" - -#: ../src/process-window.c:273 -msgid "10s" -msgstr "10s" - -#: ../src/process-window.c:314 -msgid "Show all processes" -msgstr "ھەممە processes نى كۆرسەت" - -#: ../src/process-window.c:315 -msgid "More precision" -msgstr "تېخىمۇ يۇقىرى ئېنىقلىق" - -#: ../src/process-window.c:316 -msgid "Full command line" -msgstr "مۇكەممەل بۇيرۇق قۇرى" - -#: ../src/process-window.c:317 -msgid "Show status icon" -msgstr "ھالەت سىنبەلگىسى كۆرسەت" - -#: ../src/process-window.c:320 -msgid "Refresh rate" -msgstr "يېڭىلاش rate" - -#: ../src/process-window.c:330 -msgid "Virtual Bytes" -msgstr "مەۋھۇم بايتلار" - -#: ../src/process-window.c:331 -msgid "Private Bytes" -msgstr "Private بايتلار" - -#: ../src/process-window.c:395 -msgid "translator-credits" -msgstr "Gheyret T.Kenji 2010" - -#: ../src/task-manager.c:191 -#, c-format -msgid "%lu MiB" -msgstr "%lu MiB" - -#: ../src/task-manager.c:198 -#, c-format -msgid "%lu KiB" -msgstr "%lu KiB" - -#: ../src/task-manager.c:202 -#, c-format -msgid "%lu B" -msgstr "%lu B" - -#: ../src/task-manager.c:217 -msgid "%s%%" -msgstr "%.2f%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Process سانى: %u\n" -"CPU: %.0f%%\n" -"ئەسلەك: %.0f%%\n" -"sawap: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Process سانى: %u\n" -"CPU: %.0f%%\n" -"ئەسلەك: %.0f%%\n" -"sawap: %.0f%%" +# Uyghur translation for xfce4-taskmanager. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Gheyret Kenji , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: xfce4-taskmanager\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-10-23 23:09+0000\n" +"PO-Revision-Date: 2011-11-09 16:10+0900\n" +"Last-Translator: Gheyret Kenji \n" +"Language-Team: Uyghur Computer Science Association \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "ئىشلىتىشكە ئەپلىك ۋەزىپە باشقۇرغۇ" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "ۋەزىپە باشقۇرغۇ" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "ئىجرا خاتالىقى" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "ئىجرا قىلىدىغان ھېچقانداق كۆڭۈلدىكى پروگرامما تېپىلمىدى." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "ۋەزىپە باشقۇرغۇنى ئالىي ئىشلەتكۈچى سۈپىتىدە ئىجرا قىل" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "پروگرامما ئىجرا قىل..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "پروگرامما ئىزدىگۈ" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "تېرمىنال تەقلىدلىگۈچ" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "ئىجرا سانى: %u\n" +"CPU: %.0f%%\n" +"ئەسلەك: %.0f%%\n" +"sawap: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "ئىجرا سانى: %u\n" +"CPU: %.0f%%\n" +"ئەسلەك: %.0f%%\n" +"sawap: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "CPU: %s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "Memory: %s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "Swap: %s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "ئىجرالار: %d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "ۋەزىپە" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "ھالەت" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "CPU" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "مەرتىۋە." + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "ۋەزىپىنى ئاخىرلاشتۇر" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "ۋەزىپىنى ئولتۇر" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "بۇ PID %d غا راستلا سىگنال ئەۋەتەمدۇ؟" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "سىگنال ئەۋەتىشتە خاتالىق كۆرۈلدى" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you " +"don't have the required privileges." +msgstr "بۇ PID %d غا سىگنال ئەۋەتىشتە خاتالىق كۆرۈلدى. سەۋەبى سىزنىڭ ھوقۇقىڭىز يېتەرلىك ئەمەستەك قىلىدۇ." + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "مەرتىۋىنى بەلگىلەشتە خاتالىق كۆرۈلدى" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "بۇ PID %d نىڭ مەرتىۋىسىنى بەلگىلەشتە خاتالىق كۆرۈلدى. سەۋەبى سىزنىڭ ھوقۇقىڭىز يېتەرلىك ئەمەستەك قىلىدۇ." + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "ئاخىرلاشتۇر" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "توختا" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "داۋاملاشتۇر" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "ئۆلتۈر" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "بەك تۆۋەن" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "تۆۋەن" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "نورمال" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "يۇقىرى" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "بەك يۇقىرى" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "مەرتىۋىسى" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "غەيرەت ت.كەنجى " + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "دىققەت: ئالىي ئىشلەتكۈچى(root) ھوقۇقىدا مەشغۇلات قىلىۋاتىسىز. بەك دىققەت قىلىڭ، سىستېمىنى بۇزۇپ قويۇشىڭىز مۇمكىن" + +#: ../src/settings.c:378 +msgid "Default" +msgstr "كۆڭۈلدىكى" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "كىچىك" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "چوڭ" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "تېكىست" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "ئۇچۇر" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "ئارايۈز ئۇسلۇبى" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "باشقىلار" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "ئىستون:" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "كۆزەتكۈچلەرنىڭ گىرۋەكلىرى سىزىلسۇن" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "ئۇقتۇرۇش رايونىغا يوشۇرسۇن" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "ۋەزىپىنى توختىتىدىغان چاغدا كۆرسەتمە چىقارسۇن" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "يېڭىلاش تېزلىكى:" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "تەڭشەكلەر" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "ۋەزىپە باشقۇرغۇ تەڭشەكلىرى" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "پروگرامما سىنبەلگىلىرىنى كۆرسەتسۇن" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "تولۇق بولغان بۇيرۇق قۇرىنى كۆرسەتسۇن" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "قىممەتلەرنىڭ ئېنىقلىق دەرىجىسىنى تېخىمۇ يۇقىرى كۆتۈرسۇن" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "قورال بالداق ئۇسلۇبى:" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500 مىللىسېكۇنت" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750 مىللىسېكۇنت" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1سېكۇنت" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2 سېكۇنت" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5 سېكۇنت" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10 سېكۇنت" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "ھەممە ئىجرالارنى كۆرسەتسۇن" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "يېڭىلاش تېزلىكى" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "مەۋھۇم بايتلار" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "شەخسىي بايتلار" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu م ب" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu ك ب" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu ب" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/uk.po xfce4-taskmanager-1.0.1/po/uk.po --- xfce4-taskmanager-1.0.0/po/uk.po 2010-05-28 13:48:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/uk.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,329 +1,352 @@ -# Ukrainian translation of xfce4-taskmanager. -# Copyright (C) 2005-2006 Johannes Zellner. -# This file is distributed under the same license as the xfce4-taskmanager package. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # -# Dmitry Nikitin , 2008. +# Translators: +# Dmitry Nikitin , 2008 msgid "" msgstr "" -"Project-Id-Version: xfce4-taskmanager\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-28 10:08+0000\n" -"PO-Revision-Date: 2008-07-14 13:50+0300\n" -"Last-Translator: Dmitry Nikitin \n" -"Language-Team: Ukrainian \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-09-01 23:22+0000\n" +"Last-Translator: Yarema aka Knedlyk \n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:392 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "Диспетчер задач" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "Простий у використанні диспетчер задач" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:284 -#: ../src/process-tree-view.c:298 ../src/process-tree-view.c:316 -#: ../src/process-window.c:177 ../src/process-window.c:387 -msgid "Task Manager" -msgstr "Диспетчер задач" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "Помилка при виконанні" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "Неможливо знайти жодної типової команди запуску." + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "Запустити менеджер завдань з правами root'а" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "Запустити програму..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "Шукач програм" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "Емулятор терміналу" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" -#: ../src/process-statusbar.c:139 +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Процеси: %u\nПроц: %.0f%%\nПам'ять: %.0f%%\nСвоп: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "Процеси: %u\nПроц: %.0f%%\nПам'ять: %.0f%%\nСвоп: %.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "Проц: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "Пам'ять: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "Своп: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "Процеси: %d" -#: ../src/process-tree-view.c:115 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "Задача" -#: ../src/process-tree-view.c:125 ../src/process-window.c:327 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "Ідентифікатор PID" -#: ../src/process-tree-view.c:133 ../src/process-window.c:328 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "Пріоритет PPID" -#: ../src/process-tree-view.c:141 ../src/process-window.c:329 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "Стан" -#: ../src/process-tree-view.c:150 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:158 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "Стрічка RSS" -#: ../src/process-tree-view.c:166 ../src/process-window.c:332 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:174 ../src/process-window.c:333 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "Проц" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view #. header. -#: ../src/process-tree-view.c:183 +#: ../src/process-tree-view.c:194 msgid "Prio." msgstr "Пріоритет" -#: ../src/process-tree-view.c:281 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "Завершити задачу" -#: ../src/process-tree-view.c:281 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "Знищити задачу" -#: ../src/process-tree-view.c:283 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" msgstr "Ви впевнені, що бажаєте надіслати сигнал для PID %d?" -#: ../src/process-tree-view.c:294 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" msgstr "Помилка при відсилці сигналу" -#: ../src/process-tree-view.c:296 +#: ../src/process-tree-view.c:368 #, c-format -msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." msgstr "Помилку було отримано при відсиланні сигналу для PID %d. Таке трапляється, коли Ви не маєте потрібних прав доступу." -#: ../src/process-tree-view.c:313 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" msgstr "Помилка у налаштуванні пріоритету" -#: ../src/process-tree-view.c:314 +#: ../src/process-tree-view.c:396 #, c-format -msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." msgstr "Помилку було отримано при встановленні пріорітету для PID %d. Таке трапляється, коли Ви не маєте потрібних прав доступу." -#: ../src/process-tree-view.c:331 +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "Завершити" + +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "Зупинити" -#: ../src/process-tree-view.c:338 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "Продовжити" -#: ../src/process-tree-view.c:344 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "Знищити" -#: ../src/process-tree-view.c:349 -msgid "Terminate" -msgstr "Завершити" - -#: ../src/process-tree-view.c:356 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "Дуже низько" -#: ../src/process-tree-view.c:361 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "Низько" -#: ../src/process-tree-view.c:366 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "Нормально" -#: ../src/process-tree-view.c:371 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "Високо" -#: ../src/process-tree-view.c:376 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "Дуже високо" -#: ../src/process-tree-view.c:381 ../src/process-window.c:334 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "Пріоритет" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "Помилка при виконанні" - -#: ../src/process-window.c:214 ../src/process-window.c:216 -#: ../src/process-window.c:218 -msgid "Run Program..." -msgstr "Запустити програму..." - -#: ../src/process-window.c:221 -msgid "Application Finder" -msgstr "Шукач програм" - -#: ../src/process-window.c:224 -msgid "Terminal emulator" -msgstr "Емулятор терміналу" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Dmitry Nikitin /nYarema aka Knedlyk " -#: ../src/process-window.c:226 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "Попередження: Ви використовуєте рахунок суперкористувача, Ви можете пошкодити Вашу систему." + +#: ../src/settings.c:378 +msgid "Default" +msgstr "Типово" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "Маленькі" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "Великі" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "Текст" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "Властивості для Диспетчера задач" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "Показати іконки програм" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "Показувати повністю стрічку команд" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "Показувати значення з більшою точністю" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "Відображати рамки навколо моніторів" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "Стиль панелі:" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "Стиль інтерфейсу" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "Запит на припинення задач" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "Ховати в область повідомлень" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "Додаткові" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "Період оновлення:" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "Колонки:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "Інформація" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "Властивості" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:267 -msgid "250ms" -msgstr "250мс" - -#: ../src/process-window.c:268 +#: ../src/settings-tool-button.c:110 msgid "500ms" msgstr "500мс" -#: ../src/process-window.c:269 +#: ../src/settings-tool-button.c:111 msgid "750ms" msgstr "750мс" -#: ../src/process-window.c:270 +#: ../src/settings-tool-button.c:112 msgid "1s" msgstr "1с" -#: ../src/process-window.c:271 +#: ../src/settings-tool-button.c:113 msgid "2s" msgstr "2с" -#: ../src/process-window.c:272 +#: ../src/settings-tool-button.c:114 msgid "5s" msgstr "5с" -#: ../src/process-window.c:273 +#: ../src/settings-tool-button.c:115 msgid "10s" msgstr "10с" -#: ../src/process-window.c:314 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "Показати всі процеси" -#: ../src/process-window.c:315 -msgid "More precision" -msgstr "Більше точності" - -#: ../src/process-window.c:316 -msgid "Full command line" -msgstr "Командна стрічка повністю" - -#: ../src/process-window.c:317 -msgid "Show status icon" -msgstr "Показати значок статусу" - -#: ../src/process-window.c:320 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "Період оновлення" -#: ../src/process-window.c:330 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "Віртуальні байти" -#: ../src/process-window.c:331 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "Приватні байти" -#: ../src/process-window.c:395 -msgid "translator-credits" -msgstr "Dmitry Nikitin " - -#: ../src/task-manager.c:191 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" msgstr "%lu MiB" -#: ../src/task-manager.c:198 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" msgstr "%lu KiB" -#: ../src/task-manager.c:202 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:218 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Процеси: %u\n" -"Проц: %.0f%%\n" -"Пам'ять: %.0f%%\n" -"Своп: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"Процеси: %u\n" -"Проц: %.0f%%\n" -"Пам'ять: %.0f%%\n" -"Своп: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "Керування процесами" - -#~ msgid "Process manager" -#~ msgstr "Менеджер процесів" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Диспетчер задач Xfce4" - -#~ msgid "Really kill the task?" -#~ msgstr "Дійсно знищити задачу?" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "Використано %d МБ з %d МБ" - -#~ msgid "Cpu usage" -#~ msgstr "Використання процесора" - -#~ msgid "Command" -#~ msgstr "Команда" - -#~ msgid "VM-Size" -#~ msgstr "Розмір VM" - -#~ msgid "User" -#~ msgstr "Користувач" - -#~ msgid "Show user tasks" -#~ msgstr "Відображати задачі користувача" - -#~ msgid "Show root tasks" -#~ msgstr "Відображати задачі адміністратора" - -#~ msgid "Show other tasks" -#~ msgstr "Відображати інші задачі" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "Показувати використану кешем пам'ять як вільну" - -#~ msgid "Contributors:" -#~ msgstr "Помічники:" - -#~ msgid "Couldn't set priority %d to the task with ID %d" -#~ msgstr "Не вдається встановити пріоритет %d задачі з ідентифікатором %d" diff -Nru xfce4-taskmanager-1.0.0/po/zh_CN.po xfce4-taskmanager-1.0.1/po/zh_CN.po --- xfce4-taskmanager-1.0.0/po/zh_CN.po 2010-05-24 17:41:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/zh_CN.po 2014-01-08 18:42:02.000000000 +0000 @@ -1,332 +1,353 @@ -# Chinese translations for xfce package. -# Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce package. -# Hunt Xu , 2008, 2010. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Chipong , 2013 +# elhuevogrande , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce 4-taskmanager\n" +"Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 00:53+0000\n" -"PO-Revision-Date: 2010-05-24 09:26+0800\n" -"Last-Translator: Hunt Xu \n" -"Language-Team: Chinese (simplified) \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-10-20 12:49+0000\n" +"Last-Translator: Chipong \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xfce/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" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:372 +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "任务管理器" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 msgid "Easy to use task manager" msgstr "易用的任务管理器" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:177 ../src/process-window.c:367 -msgid "Task Manager" -msgstr "任务管理器" +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "执行错误" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "无法找到任何默认的命令来运行。" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "使用 root 运行任务管理器" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "运行程序 ..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "应用程序查找器" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "终端模拟器" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "进程数: %u\nCPU: %.0f%%\n内存: %.0f%%\n交换区: %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "进程数: %u\nCPU: %.0f%%\n内存: %.0f%%\n交换区: %.0f%%" -#: ../src/process-statusbar.c:139 +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 #, c-format msgid "CPU: %s%%" msgstr "CPU: %s%%" -#: ../src/process-statusbar.c:148 +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 #, c-format msgid "Memory: %s%%" msgstr "内存: %s%%" -#: ../src/process-statusbar.c:157 +#: ../src/process-statusbar.c:166 #, c-format msgid "Swap: %s%%" msgstr "交换分区: %s%%" -#: ../src/process-statusbar.c:172 +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" msgstr "进程数: %d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" msgstr "任务" -#: ../src/process-tree-view.c:116 ../src/process-window.c:307 +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:308 +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:309 +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 msgid "State" msgstr "状态" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:312 +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 msgid "UID" msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:313 +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 msgid "CPU" msgstr "CPU" -#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "优先级" +msgstr "优先级." -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" msgstr "终止任务" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Kill task" msgstr "杀死任务" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "您确认要发送一个信号至 PID 为 %d 的进程吗？" +msgstr "您确定要发送一个信号至 PID %d 吗？" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "发送信号时发生错误" +msgstr "发送信号时出错误" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" -"发送信号至 PID 为 %d 的进程时发生一个错误。您可能没有足够的权限进行该操作。" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "发送信号至 PID %d 时出错。您可能没有所需的权限。" -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "设置优先级时发生错误" +msgstr "设置优先级时出错" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format msgid "" "An error was encountered by setting a priority to the PID %d. It is likely " "you don't have the required privileges." -msgstr "" -"设置 PID 为 %d 的进程的优先级时发生一个错误。您可能没有足够的权限进行该操作。" +msgstr "设置 PID %d 的优先级时出错。您可能没有所需的权限。" + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "终止" -#: ../src/process-tree-view.c:262 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "停止" -#: ../src/process-tree-view.c:269 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "继续" -#: ../src/process-tree-view.c:275 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "杀死" -#: ../src/process-tree-view.c:280 -msgid "Terminate" -msgstr "终止" - -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" msgstr "非常低" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" msgstr "低" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" msgstr "正常" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" msgstr "高" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" msgstr "非常高" -#: ../src/process-tree-view.c:312 ../src/process-window.c:314 +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 msgid "Priority" msgstr "优先级" -#: ../src/process-window.c:175 -msgid "Execution error" -msgstr "执行错误" - -#: ../src/process-window.c:203 -msgid "Run Program..." -msgstr "运行程序..." - -#: ../src/process-window.c:204 -msgid "Application Finder" -msgstr "应用程序查找器" - -#: ../src/process-window.c:205 -msgid "Terminal emulator" -msgstr "终端模拟器" +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Hunt Xu , 2008, 2010." -#: ../src/process-window.c:206 -msgid "XTerm" -msgstr "XTerm" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "警告，您正在使用 root 帐户，有可能会损害您的系统。" + +#: ../src/settings.c:378 +msgid "Default" +msgstr "默认" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "小" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "大" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "文本" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "任务管理器的设置" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "显示应用程序图标" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "显示完整的命令行" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "显示更精确的数值" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "在显示器周围绘制边框" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "工具栏样式：" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "界面风格" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "终止任务时提示" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "在通知区域隐藏" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "杂项" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "刷新率：" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "\t\n栏:" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "信息" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "设置" #. TRANSLATORS: The next values are in seconds or milliseconds -#: ../src/process-window.c:247 -msgid "250ms" -msgstr "250 毫秒" - -#: ../src/process-window.c:248 +#: ../src/settings-tool-button.c:110 msgid "500ms" -msgstr "500 毫秒" +msgstr "500 ms" -#: ../src/process-window.c:249 +#: ../src/settings-tool-button.c:111 msgid "750ms" -msgstr "750 毫秒" +msgstr "750 ms" -#: ../src/process-window.c:250 +#: ../src/settings-tool-button.c:112 msgid "1s" -msgstr "1 秒" +msgstr "1 s" -#: ../src/process-window.c:251 +#: ../src/settings-tool-button.c:113 msgid "2s" -msgstr "2 秒" +msgstr "2 s" -#: ../src/process-window.c:252 +#: ../src/settings-tool-button.c:114 msgid "5s" -msgstr "5 秒" +msgstr "5 s" -#: ../src/process-window.c:253 +#: ../src/settings-tool-button.c:115 msgid "10s" -msgstr "10 秒" +msgstr "10 s" -#: ../src/process-window.c:294 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" msgstr "显示所有进程" -#: ../src/process-window.c:295 -msgid "More precision" -msgstr "更精确的选项" - -#: ../src/process-window.c:296 -msgid "Full command line" -msgstr "完整的命令行" - -#: ../src/process-window.c:297 -msgid "Show status icon" -msgstr "现实状态图标" - -#: ../src/process-window.c:300 +#: ../src/settings-tool-button.c:167 msgid "Refresh rate" msgstr "刷新率" -#: ../src/process-window.c:310 +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" msgstr "虚拟占用内存" -#: ../src/process-window.c:311 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" msgstr "私有占用内存" -#: ../src/process-window.c:375 -msgid "translator-credits" -msgstr "HuntXu , 2008, 2010." - -#: ../src/task-manager.c:165 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "%lu MiB" +msgstr "%lu MB" -#: ../src/task-manager.c:172 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "%lu KiB" +msgstr "%lu KB" -#: ../src/task-manager.c:176 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" msgstr "%lu B" -#: ../src/task-manager.c:189 +#: ../src/task-manager.c:263 #, c-format msgid "%s%%" msgstr "%s%%" - -#: ../src/main.c:61 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"进程数: %u\n" -"CPU: %.0f%%\n" -"内存: %.0f%%\n" -"交换区: %.0f%%" - -#: ../src/main.c:69 -#, c-format -msgid "" -"Processes: %u\n" -"CPU: %.0f%%\n" -"Memory: %.0f%%\n" -"Swap: %.0f%%" -msgstr "" -"进程数: %u\n" -"CPU: %.0f%%\n" -"内存: %.0f%%\n" -"交换区: %.0f%%" - -#~ msgid "Control your processes" -#~ msgstr "管理您的进程" - -#~ msgid "Process manager" -#~ msgstr "进程管理器" - -#~ msgid "Xfce4 Taskmanager" -#~ msgstr "Xfce4 任务管理器" - -#~ msgid "Really kill the task?" -#~ msgstr "确认杀死这个任务吗？" - -#~ msgid "%d MB of %d MB used" -#~ msgstr "%2$d MB 中的 %1$d MB 已使用" - -#~ msgid "Cpu usage" -#~ msgstr "CPU 使用率" - -#~ msgid "Memory usage" -#~ msgstr "内存使用率" - -#~ msgid "Command" -#~ msgstr "命令" - -#~ msgid "VM-Size" -#~ msgstr "VM 大小" - -#~ msgid "User" -#~ msgstr "用户" - -#~ msgid "Show user tasks" -#~ msgstr "显示用户任务" - -#~ msgid "Show root tasks" -#~ msgstr "显示root用户任务" - -#~ msgid "Show other tasks" -#~ msgstr "显示其他任务" - -#~ msgid "Show memory used by cache as free" -#~ msgstr "显示作为 cache 使用的内存为空闲" - -#~ msgid "Contributors:" -#~ msgstr "贡献者：" diff -Nru xfce4-taskmanager-1.0.0/po/zh_HK.po xfce4-taskmanager-1.0.1/po/zh_HK.po --- xfce4-taskmanager-1.0.0/po/zh_HK.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/zh_HK.po 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,353 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Cosmo Chene , 2006 +# Walter Cheuk , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Apps\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-03 20:41+0200\n" +"PO-Revision-Date: 2013-12-25 02:57+0000\n" +"Last-Translator: Walter Cheuk \n" +"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/xfce/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" + +#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 ../src/main.c:156 +#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 +msgid "Task Manager" +msgstr "工作管理員" + +#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309 +msgid "Easy to use task manager" +msgstr "易用的工作管理員" + +#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "執行發生錯誤" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "找不到任何預設指令可執行。" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "以 root 身份執行「工作管理員」" + +#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "執行程式..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "應用程式協尋器" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "終端機模擬器" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" + +#: ../src/main.c:100 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "進程數： %u\nCPU： %.0f%%\n記憶體： %.0f%%\n置換空間： %.0f%%" + +#: ../src/main.c:108 +#, c-format +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "進程數：%u\nCPU：%.0f%%\n記憶體：%.0f%%\n置換空間：%.0f%%" + +#: ../src/process-statusbar.c:148 ../src/process-window.c:374 +#, c-format +msgid "CPU: %s%%" +msgstr "CPU：%s%%" + +#: ../src/process-statusbar.c:157 ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "記憶體：%s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "置換空間：%s%%" + +#: ../src/process-statusbar.c:181 +#, c-format +msgid "Processes: %d" +msgstr "進程數：%d" + +#: ../src/process-tree-view.c:125 +msgid "Task" +msgstr "工作" + +#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174 +msgid "PID" +msgstr "PID" + +#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175 +msgid "PPID" +msgstr "PPID" + +#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176 +msgid "State" +msgstr "狀態" + +#: ../src/process-tree-view.c:161 +msgid "VSZ" +msgstr "VSZ" + +#: ../src/process-tree-view.c:169 +msgid "RSS" +msgstr "RSS" + +#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179 +msgid "UID" +msgstr "UID" + +#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180 +msgid "CPU" +msgstr "CPU" + +#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view +#. header. +#: ../src/process-tree-view.c:194 +msgid "Prio." +msgstr "優先" + +#: ../src/process-tree-view.c:352 +msgid "Terminate task" +msgstr "終止工作" + +#: ../src/process-tree-view.c:352 +msgid "Kill task" +msgstr "強行中止工作" + +#: ../src/process-tree-view.c:354 +#, c-format +msgid "Are you sure you want to send a signal to the PID %d?" +msgstr "確定要傳送訊號給 PID %d 嗎？" + +#: ../src/process-tree-view.c:366 +msgid "Error sending signal" +msgstr "傳送訊號時發生錯誤" + +#: ../src/process-tree-view.c:368 +#, c-format +msgid "" +"An error was encountered by sending a signal to the PID %d. It is likely you" +" don't have the required privileges." +msgstr "傳送訊號給 PID %d 時遭遇錯誤。很可能你沒有應具備的特權。" + +#: ../src/process-tree-view.c:395 +msgid "Error setting priority" +msgstr "設定優先權時發生錯誤" + +#: ../src/process-tree-view.c:396 +#, c-format +msgid "" +"An error was encountered by setting a priority to the PID %d. It is likely " +"you don't have the required privileges." +msgstr "設定 PID %d 的優先權時遭遇錯誤。很可能你沒有應具備的特權。" + +#: ../src/process-tree-view.c:412 +msgid "Terminate" +msgstr "終止" + +#: ../src/process-tree-view.c:420 +msgid "Stop" +msgstr "停止" + +#: ../src/process-tree-view.c:427 +msgid "Continue" +msgstr "繼續" + +#: ../src/process-tree-view.c:433 +msgid "Kill" +msgstr "強行中止" + +#: ../src/process-tree-view.c:440 +msgid "Very low" +msgstr "非常低" + +#: ../src/process-tree-view.c:445 +msgid "Low" +msgstr "低" + +#: ../src/process-tree-view.c:450 +msgid "Normal" +msgstr "正常" + +#: ../src/process-tree-view.c:455 +msgid "High" +msgstr "高" + +#: ../src/process-tree-view.c:460 +msgid "Very high" +msgstr "非常高" + +#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181 +msgid "Priority" +msgstr "優先權" + +#: ../src/process-window.c:312 +msgid "translator-credits" +msgstr "Cosmo Chene\nCheng-Chia Tseng , 2012.\nWalter Cheuk , 2013." + +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "警告，你正使用 root 帳號，有可能因此損害系統。" + +#: ../src/settings.c:378 +msgid "Default" +msgstr "預設" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "小" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "大" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "文字" + +#: ../src/settings-dialog.ui.h:1 +msgid "Settings for Task Manager" +msgstr "工作管理員設定" + +#: ../src/settings-dialog.ui.h:2 +msgid "Show application icons" +msgstr "顯示應用程式圖示" + +#: ../src/settings-dialog.ui.h:3 +msgid "Show full command lines" +msgstr "顯示完整指令列" + +#: ../src/settings-dialog.ui.h:4 +msgid "Show values with more precision" +msgstr "顯示更精準的值" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "描繪螢幕周圍邊緣" + +#: ../src/settings-dialog.ui.h:6 +msgid "Toolbar style:" +msgstr "工具列樣式：" + +#: ../src/settings-dialog.ui.h:7 +msgid "Interface style" +msgstr "資訊樣式" + +#: ../src/settings-dialog.ui.h:8 +msgid "Prompt for terminating tasks" +msgstr "提請終止工作" + +#: ../src/settings-dialog.ui.h:9 +msgid "Hide into the notification area" +msgstr "隱藏至通知區域" + +#: ../src/settings-dialog.ui.h:10 +msgid "Miscellaneous" +msgstr "雜項" + +#: ../src/settings-dialog.ui.h:11 +msgid "Refresh rate:" +msgstr "重新整理速率：" + +#: ../src/settings-dialog.ui.h:12 +msgid "Columns:" +msgstr "欄數：" + +#: ../src/settings-dialog.ui.h:13 +msgid "Information" +msgstr "資訊" + +#: ../src/settings-dialog.ui.h:14 +msgid "Settings" +msgstr "設定" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500毫秒" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750毫秒" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1秒" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2秒" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5秒" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10秒" + +#: ../src/settings-tool-button.c:164 +msgid "Show all processes" +msgstr "顯示所有進程" + +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "重新整理速率" + +#: ../src/settings-tool-button.c:177 +msgid "Virtual Bytes" +msgstr "虛擬位元組" + +#: ../src/settings-tool-button.c:178 +msgid "Private Bytes" +msgstr "私有位元組" + +#: ../src/task-manager.c:229 +#, c-format +msgid "%lu MiB" +msgstr "%lu MiB" + +#: ../src/task-manager.c:236 +#, c-format +msgid "%lu KiB" +msgstr "%lu KiB" + +#: ../src/task-manager.c:240 +#, c-format +msgid "%lu B" +msgstr "%lu B" + +#: ../src/task-manager.c:263 +#, c-format +msgid "%s%%" +msgstr "%s%%" diff -Nru xfce4-taskmanager-1.0.0/po/zh_TW.po xfce4-taskmanager-1.0.1/po/zh_TW.po --- xfce4-taskmanager-1.0.0/po/zh_TW.po 2010-05-21 12:35:08.000000000 +0000 +++ xfce4-taskmanager-1.0.1/po/zh_TW.po 2014-01-08 18:42:02.000000000 +0000 @@ -8,224 +8,371 @@ msgstr "" "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 23:04+0200\n" -"PO-Revision-Date: 2008-07-31 01:01+0200\n" -"Last-Translator: Cosmo Chene \n" +"POT-Creation-Date: 2012-07-11 04:39+0000\n" +"PO-Revision-Date: 2012-07-11 16:29+0800\n" +"Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Tradictional Chinese \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326 +#: ../xfce4-taskmanager.desktop.in.h:1 +#: ../src/process-window.c:309 msgid "Easy to use task manager" -msgstr "" +msgstr "易於使用的工作管理員" -#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215 -#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247 -#: ../src/process-window.c:199 ../src/process-window.c:321 -#, fuzzy +#: ../xfce4-taskmanager.desktop.in.h:2 +#: ../src/exec-tool-button.c:89 +#: ../src/exec-tool-button.c:134 +#: ../src/main.c:156 +#: ../src/process-tree-view.c:355 +#: ../src/process-tree-view.c:370 +#: ../src/process-tree-view.c:398 +#: ../src/process-window.c:304 +#: ../src/process-window.ui.h:1 msgid "Task Manager" -msgstr "xfce4-工作管理員" +msgstr "工作管理員" + +#: ../src/exec-tool-button.c:87 +#: ../src/exec-tool-button.c:131 +msgid "Execution error" +msgstr "執行發生錯誤" + +#: ../src/exec-tool-button.c:133 +msgid "Couldn't find any default command to run." +msgstr "找不到任何預設指令可執行。" + +#: ../src/exec-tool-button.c:164 +msgid "Run Task Manager as root" +msgstr "以 root 身份執行「工作管理員」" + +#: ../src/exec-tool-button.c:175 +#: ../src/exec-tool-button.c:177 +#: ../src/exec-tool-button.c:179 +msgid "Run Program..." +msgstr "執行程式..." + +#: ../src/exec-tool-button.c:182 +msgid "Application Finder" +msgstr "應用程式協尋器" + +#: ../src/exec-tool-button.c:185 +msgid "Terminal emulator" +msgstr "終端機模擬器" + +#: ../src/exec-tool-button.c:187 +msgid "XTerm" +msgstr "XTerm" -#: ../src/process-statusbar.c:121 +#: ../src/main.c:100 #, c-format -msgid "CPU: %.2f%%" -msgstr "" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" +msgstr "" +"程序： %u\n" +"CPU： %.0f%%\n" +"記憶體： %.0f%%\n" +"置換空間： %.0f%%" -#: ../src/process-statusbar.c:128 +#: ../src/main.c:108 #, c-format -msgid "Memory: %.2f%%" +msgid "" +"Processes: %u\n" +"CPU: %.0f%%\n" +"Memory: %.0f%%\n" +"Swap: %.0f%%" msgstr "" +"程序：%u\n" +"CPU：%.0f%%\n" +"記憶體：%.0f%%\n" +"置換空間：%.0f%%" -#: ../src/process-statusbar.c:135 +#: ../src/process-statusbar.c:148 +#: ../src/process-window.c:374 #, c-format -msgid "Swap: %.2f%%" -msgstr "" +msgid "CPU: %s%%" +msgstr "CPU：%s%%" -#: ../src/process-statusbar.c:142 +#: ../src/process-statusbar.c:157 +#: ../src/process-window.c:379 +#, c-format +msgid "Memory: %s%%" +msgstr "記憶體：%s%%" + +#: ../src/process-statusbar.c:166 +#, c-format +msgid "Swap: %s%%" +msgstr "置換空間：%s%%" + +#: ../src/process-statusbar.c:181 #, c-format msgid "Processes: %d" -msgstr "" +msgstr "程序：%d" -#: ../src/process-tree-view.c:106 +#: ../src/process-tree-view.c:125 msgid "Task" -msgstr "" +msgstr "工作" -#: ../src/process-tree-view.c:116 ../src/process-window.c:276 +#: ../src/process-tree-view.c:136 +#: ../src/settings-tool-button.c:174 msgid "PID" msgstr "PID" -#: ../src/process-tree-view.c:124 ../src/process-window.c:277 +#: ../src/process-tree-view.c:144 +#: ../src/settings-tool-button.c:175 msgid "PPID" msgstr "PPID" -#: ../src/process-tree-view.c:132 ../src/process-window.c:278 +#: ../src/process-tree-view.c:152 +#: ../src/settings-tool-button.c:176 msgid "State" msgstr "狀態" -#: ../src/process-tree-view.c:141 +#: ../src/process-tree-view.c:161 msgid "VSZ" -msgstr "" +msgstr "VSZ" -#: ../src/process-tree-view.c:149 +#: ../src/process-tree-view.c:169 msgid "RSS" msgstr "RSS" -#: ../src/process-tree-view.c:157 ../src/process-window.c:281 -#, fuzzy +#: ../src/process-tree-view.c:177 +#: ../src/settings-tool-button.c:179 msgid "UID" -msgstr "PID" +msgstr "UID" -#: ../src/process-tree-view.c:165 ../src/process-window.c:282 -#, fuzzy +#: ../src/process-tree-view.c:185 +#: ../src/settings-tool-button.c:180 msgid "CPU" -msgstr "CPU%" +msgstr "CPU" #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header. -#: ../src/process-tree-view.c:174 +#: ../src/process-tree-view.c:194 msgid "Prio." -msgstr "" +msgstr "優先" -#: ../src/process-tree-view.c:212 +#: ../src/process-tree-view.c:352 msgid "Terminate task" -msgstr "" +msgstr "終止工作" -#: ../src/process-tree-view.c:212 -#, fuzzy +#: ../src/process-tree-view.c:352 msgid "Kill task" -msgstr "強行中止" +msgstr "強制結束工作" -#: ../src/process-tree-view.c:214 +#: ../src/process-tree-view.c:354 #, c-format msgid "Are you sure you want to send a signal to the PID %d?" -msgstr "" +msgstr "您確定您要傳送訊號給 PID %d 嗎？" -#: ../src/process-tree-view.c:225 +#: ../src/process-tree-view.c:366 msgid "Error sending signal" -msgstr "" +msgstr "傳送訊號時發生錯誤" -#: ../src/process-tree-view.c:227 +#: ../src/process-tree-view.c:368 #, c-format -msgid "" -"An error was encountered by sending a signal to the PID %d. It is likely you " -"don't have the required privileges." -msgstr "" +msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." +msgstr "傳送訊號給 PID %d 時遭遇錯誤。很可能您沒有應具備的特權。" -#: ../src/process-tree-view.c:244 +#: ../src/process-tree-view.c:395 msgid "Error setting priority" -msgstr "" +msgstr "設定優先權時發生錯誤" -#: ../src/process-tree-view.c:245 +#: ../src/process-tree-view.c:396 #, c-format -msgid "" -"An error was encountered by setting a priority to the PID %d. It is likely " -"you don't have the required privileges." -msgstr "" +msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges." +msgstr "設定 PID %d 的優先權時遭遇錯誤。很可能您沒有應具備的特權。" -#: ../src/process-tree-view.c:260 -#, fuzzy +#: ../src/process-tree-view.c:412 msgid "Terminate" -msgstr "Term" +msgstr "終止" -#: ../src/process-tree-view.c:267 +#: ../src/process-tree-view.c:420 msgid "Stop" msgstr "停止" -#: ../src/process-tree-view.c:274 +#: ../src/process-tree-view.c:427 msgid "Continue" msgstr "繼續" -#: ../src/process-tree-view.c:280 +#: ../src/process-tree-view.c:433 msgid "Kill" msgstr "強行中止" -#: ../src/process-tree-view.c:287 +#: ../src/process-tree-view.c:440 msgid "Very low" -msgstr "" +msgstr "非常低" -#: ../src/process-tree-view.c:292 +#: ../src/process-tree-view.c:445 msgid "Low" -msgstr "" +msgstr "低" -#: ../src/process-tree-view.c:297 +#: ../src/process-tree-view.c:450 msgid "Normal" -msgstr "" +msgstr "正常" -#: ../src/process-tree-view.c:302 +#: ../src/process-tree-view.c:455 msgid "High" -msgstr "" +msgstr "高" -#: ../src/process-tree-view.c:307 +#: ../src/process-tree-view.c:460 msgid "Very high" -msgstr "" +msgstr "非常高" -#: ../src/process-tree-view.c:312 ../src/process-window.c:283 +#: ../src/process-tree-view.c:465 +#: ../src/settings-tool-button.c:181 msgid "Priority" -msgstr "" - -#: ../src/process-window.c:197 -msgid "Execution error" -msgstr "" - -#: ../src/process-window.c:226 -msgid "Run Program..." -msgstr "" - -#: ../src/process-window.c:227 -msgid "Application Finder" -msgstr "" +msgstr "優先權" -#: ../src/process-window.c:228 -msgid "Terminal emulator" +#: ../src/process-window.c:312 +msgid "translator-credits" msgstr "" +"Cosmo Chene\n" +"Cheng-Chia Tseng , 2012." -#: ../src/process-window.c:229 -#, fuzzy -msgid "XTerm" -msgstr "Term" +#: ../src/process-window.ui.h:2 +msgid "Warning, you are using the root account, you may harm your system." +msgstr "警告，您正使用 root 帳號，您有可能因此損害到您的系統。" + +#: ../src/settings.c:378 +msgid "Default" +msgstr "預設" + +#: ../src/settings.c:379 +msgid "Small" +msgstr "小" + +#: ../src/settings.c:380 +msgid "Large" +msgstr "大" + +#: ../src/settings.c:381 +msgid "Text" +msgstr "文字" + +#: ../src/settings-dialog.ui.h:1 +msgid "Information" +msgstr "資訊" + +#: ../src/settings-dialog.ui.h:2 +msgid "Interface style" +msgstr "資訊樣式" + +#: ../src/settings-dialog.ui.h:3 +msgid "Miscellaneous" +msgstr "雜項" + +#: ../src/settings-dialog.ui.h:4 +msgid "Columns:" +msgstr "欄數：" + +#: ../src/settings-dialog.ui.h:5 +msgid "Draw borders around monitors" +msgstr "描繪螢幕周圍邊緣" + +#: ../src/settings-dialog.ui.h:6 +msgid "Hide into the notification area" +msgstr "隱藏至通知區域" + +#: ../src/settings-dialog.ui.h:7 +msgid "Prompt for terminating tasks" +msgstr "提請終止工作" + +#: ../src/settings-dialog.ui.h:8 +msgid "Refresh rate:" +msgstr "重新整理速率：" + +#: ../src/settings-dialog.ui.h:9 +msgid "Settings" +msgstr "設定值" + +#: ../src/settings-dialog.ui.h:10 +msgid "Settings for Task Manager" +msgstr "工作管理員的設定值" + +#: ../src/settings-dialog.ui.h:11 +msgid "Show application icons" +msgstr "顯示應用程式圖示" + +#: ../src/settings-dialog.ui.h:12 +msgid "Show full command lines" +msgstr "顯示完整指令列" + +#: ../src/settings-dialog.ui.h:13 +msgid "Show values with more precision" +msgstr "顯示更精準的數值" + +#: ../src/settings-dialog.ui.h:14 +msgid "Toolbar style:" +msgstr "工具列樣式：" + +#. TRANSLATORS: The next values are in seconds or milliseconds +#: ../src/settings-tool-button.c:110 +msgid "500ms" +msgstr "500毫秒" + +#: ../src/settings-tool-button.c:111 +msgid "750ms" +msgstr "750毫秒" + +#: ../src/settings-tool-button.c:112 +msgid "1s" +msgstr "1秒" + +#: ../src/settings-tool-button.c:113 +msgid "2s" +msgstr "2秒" + +#: ../src/settings-tool-button.c:114 +msgid "5s" +msgstr "5秒" + +#: ../src/settings-tool-button.c:115 +msgid "10s" +msgstr "10秒" -#: ../src/process-window.c:271 +#: ../src/settings-tool-button.c:164 msgid "Show all processes" -msgstr "" +msgstr "顯示所有程序" -#: ../src/process-window.c:279 +#: ../src/settings-tool-button.c:167 +msgid "Refresh rate" +msgstr "重新整理速率" + +#: ../src/settings-tool-button.c:177 msgid "Virtual Bytes" -msgstr "" +msgstr "虛擬位元組" -#: ../src/process-window.c:280 +#: ../src/settings-tool-button.c:178 msgid "Private Bytes" -msgstr "" - -#: ../src/process-window.c:329 -msgid "translator-credits" -msgstr "Cosmo Chene" +msgstr "私有位元組" -#: ../src/task-manager.c:146 +#: ../src/task-manager.c:229 #, c-format msgid "%lu MiB" -msgstr "" +msgstr "%lu MiB" -#: ../src/task-manager.c:153 +#: ../src/task-manager.c:236 #, c-format msgid "%lu KiB" -msgstr "" +msgstr "%lu KiB" -#: ../src/task-manager.c:157 +#: ../src/task-manager.c:240 #, c-format msgid "%lu B" -msgstr "" +msgstr "%lu B" -#. TODO make precision optional -#: ../src/task-manager.c:168 +#: ../src/task-manager.c:263 #, c-format -msgid "%.2f%%" -msgstr "" +msgid "%s%%" +msgstr "%s%%" -#, fuzzy #~ msgid "Process manager" #~ msgstr "xfce4-工作管理員" -#, fuzzy #~ msgid "Xfce4 Taskmanager" #~ msgstr "xfce4-工作管理員" diff -Nru xfce4-taskmanager-1.0.0/src/Makefile.am xfce4-taskmanager-1.0.1/src/Makefile.am --- xfce4-taskmanager-1.0.0/src/Makefile.am 2010-06-13 16:46:37.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/Makefile.am 2014-01-08 18:42:02.000000000 +0000 @@ -12,12 +12,14 @@ $(GTK_CFLAGS) \ $(CAIRO_CFLAGS) \ $(WNCK_CFLAGS) \ + $(GKSU_CFLAGS) \ $(NULL) xfce4_taskmanager_LDADD = \ $(GTK_LIBS) \ $(CAIRO_LIBS) \ $(WNCK_LIBS) \ + $(GKSU_LIBS) \ $(NULL) xfce4_taskmanager_SOURCES = \ @@ -27,8 +29,12 @@ process-monitor.c process-monitor.h \ process-tree-view.c process-tree-view.h \ process-statusbar.c process-statusbar.h \ - task-manager.c task-manager.h \ + exec-tool-button.c exec-tool-button.h \ + settings-tool-button.c settings-tool-button.h \ + settings-dialog_ui.h \ + settings-dialog.c settings-dialog.h \ settings.c settings.h \ + task-manager.c task-manager.h \ $(NULL) if HAVE_WNCK @@ -52,10 +58,12 @@ endif if MAINTAINER_MODE -BUILT_SOURCES = process-window_ui.h +BUILT_SOURCES = process-window_ui.h settings-dialog_ui.h process-window_ui.h: process-window.ui $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=process_window_ui $< >$@ +settings-dialog_ui.h: settings-dialog.ui + $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=settings_dialog_ui $< >$@ endif -EXTRA_DIST = process-window.ui +EXTRA_DIST = process-window.ui settings-dialog.ui diff -Nru xfce4-taskmanager-1.0.0/src/Makefile.in xfce4-taskmanager-1.0.1/src/Makefile.in --- xfce4-taskmanager-1.0.0/src/Makefile.in 2010-06-14 11:02:24.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/Makefile.in 2014-01-08 18:42:04.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,12 +87,13 @@ @OS_LINUX_TRUE@am__append_5 = task-manager-linux.c @OS_SKEL_TRUE@am__append_6 = task-manager-skel.c subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -57,9 +102,12 @@ am__xfce4_taskmanager_SOURCES_DIST = main.c process-window_ui.h \ process-window.c process-window.h process-monitor.c \ process-monitor.h process-tree-view.c process-tree-view.h \ - process-statusbar.c process-statusbar.h task-manager.c \ - task-manager.h settings.c settings.h app-manager.c \ - app-manager.h task-manager-freebsd.c task-manager-bsd.c \ + process-statusbar.c process-statusbar.h exec-tool-button.c \ + exec-tool-button.h settings-tool-button.c \ + settings-tool-button.h settings-dialog_ui.h settings-dialog.c \ + settings-dialog.h settings.c settings.h task-manager.c \ + task-manager.h app-manager.c app-manager.h \ + task-manager-freebsd.c task-manager-bsd.c \ task-manager-solaris.c task-manager-linux.c \ task-manager-skel.c am__objects_1 = @@ -78,22 +126,38 @@ xfce4_taskmanager-process-monitor.$(OBJEXT) \ xfce4_taskmanager-process-tree-view.$(OBJEXT) \ xfce4_taskmanager-process-statusbar.$(OBJEXT) \ - xfce4_taskmanager-task-manager.$(OBJEXT) \ - xfce4_taskmanager-settings.$(OBJEXT) $(am__objects_1) \ + xfce4_taskmanager-exec-tool-button.$(OBJEXT) \ + xfce4_taskmanager-settings-tool-button.$(OBJEXT) \ + xfce4_taskmanager-settings-dialog.$(OBJEXT) \ + xfce4_taskmanager-settings.$(OBJEXT) \ + xfce4_taskmanager-task-manager.$(OBJEXT) $(am__objects_1) \ $(am__objects_2) $(am__objects_3) $(am__objects_4) \ $(am__objects_5) $(am__objects_6) $(am__objects_7) xfce4_taskmanager_OBJECTS = $(am_xfce4_taskmanager_OBJECTS) am__DEPENDENCIES_1 = xfce4_taskmanager_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +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 = xfce4_taskmanager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xfce4_taskmanager_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -104,24 +168,42 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xfce4_taskmanager_SOURCES) DIST_SOURCES = $(am__xfce4_taskmanager_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -149,6 +231,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -158,6 +241,10 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GKSU_CFLAGS = @GKSU_CFLAGS@ +GKSU_LIBS = @GKSU_LIBS@ +GKSU_REQUIRED_VERSION = @GKSU_REQUIRED_VERSION@ +GKSU_VERSION = @GKSU_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -176,6 +263,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -186,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -206,6 +298,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -227,6 +321,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -255,6 +350,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -288,23 +385,28 @@ $(GTK_CFLAGS) \ $(CAIRO_CFLAGS) \ $(WNCK_CFLAGS) \ + $(GKSU_CFLAGS) \ $(NULL) xfce4_taskmanager_LDADD = \ $(GTK_LIBS) \ $(CAIRO_LIBS) \ $(WNCK_LIBS) \ + $(GKSU_LIBS) \ $(NULL) xfce4_taskmanager_SOURCES = main.c process-window_ui.h \ process-window.c process-window.h process-monitor.c \ process-monitor.h process-tree-view.c process-tree-view.h \ - process-statusbar.c process-statusbar.h task-manager.c \ - task-manager.h settings.c settings.h $(NULL) $(am__append_1) \ - $(am__append_2) $(am__append_3) $(am__append_4) \ - $(am__append_5) $(am__append_6) -@MAINTAINER_MODE_TRUE@BUILT_SOURCES = process-window_ui.h -EXTRA_DIST = process-window.ui + process-statusbar.c process-statusbar.h exec-tool-button.c \ + exec-tool-button.h settings-tool-button.c \ + settings-tool-button.h settings-dialog_ui.h settings-dialog.c \ + settings-dialog.h settings.c settings.h task-manager.c \ + task-manager.h $(NULL) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) $(am__append_5) \ + $(am__append_6) +@MAINTAINER_MODE_TRUE@BUILT_SOURCES = process-window_ui.h settings-dialog_ui.h +EXTRA_DIST = process-window.ui settings-dialog.ui all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -342,14 +444,19 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -370,7 +477,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -383,7 +491,8 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -xfce4-taskmanager$(EXEEXT): $(xfce4_taskmanager_OBJECTS) $(xfce4_taskmanager_DEPENDENCIES) + +xfce4-taskmanager$(EXEEXT): $(xfce4_taskmanager_OBJECTS) $(xfce4_taskmanager_DEPENDENCIES) $(EXTRA_xfce4_taskmanager_DEPENDENCIES) @rm -f xfce4-taskmanager$(EXEEXT) $(AM_V_CCLD)$(xfce4_taskmanager_LINK) $(xfce4_taskmanager_OBJECTS) $(xfce4_taskmanager_LDADD) $(LIBS) @@ -394,11 +503,14 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-app-manager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-exec-tool-button.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-process-monitor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-process-statusbar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-process-tree-view.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-process-window.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-settings-dialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-settings-tool-button.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-settings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-task-manager-bsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_taskmanager-task-manager-freebsd.Po@am__quote@ @@ -410,234 +522,247 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< xfce4_taskmanager-main.o: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-main.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-main.Tpo -c -o xfce4_taskmanager-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-main.Tpo $(DEPDIR)/xfce4_taskmanager-main.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfce4_taskmanager-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='xfce4_taskmanager-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c xfce4_taskmanager-main.obj: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-main.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-main.Tpo -c -o xfce4_taskmanager-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-main.Tpo $(DEPDIR)/xfce4_taskmanager-main.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfce4_taskmanager-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='xfce4_taskmanager-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` xfce4_taskmanager-process-window.o: process-window.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-window.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-window.Tpo -c -o xfce4_taskmanager-process-window.o `test -f 'process-window.c' || echo '$(srcdir)/'`process-window.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-window.Tpo $(DEPDIR)/xfce4_taskmanager-process-window.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-window.c' object='xfce4_taskmanager-process-window.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-window.c' object='xfce4_taskmanager-process-window.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-window.o `test -f 'process-window.c' || echo '$(srcdir)/'`process-window.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-window.o `test -f 'process-window.c' || echo '$(srcdir)/'`process-window.c xfce4_taskmanager-process-window.obj: process-window.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-window.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-window.Tpo -c -o xfce4_taskmanager-process-window.obj `if test -f 'process-window.c'; then $(CYGPATH_W) 'process-window.c'; else $(CYGPATH_W) '$(srcdir)/process-window.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-window.Tpo $(DEPDIR)/xfce4_taskmanager-process-window.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-window.c' object='xfce4_taskmanager-process-window.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-window.c' object='xfce4_taskmanager-process-window.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-window.obj `if test -f 'process-window.c'; then $(CYGPATH_W) 'process-window.c'; else $(CYGPATH_W) '$(srcdir)/process-window.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-window.obj `if test -f 'process-window.c'; then $(CYGPATH_W) 'process-window.c'; else $(CYGPATH_W) '$(srcdir)/process-window.c'; fi` xfce4_taskmanager-process-monitor.o: process-monitor.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-monitor.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-monitor.Tpo -c -o xfce4_taskmanager-process-monitor.o `test -f 'process-monitor.c' || echo '$(srcdir)/'`process-monitor.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-monitor.Tpo $(DEPDIR)/xfce4_taskmanager-process-monitor.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-monitor.c' object='xfce4_taskmanager-process-monitor.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-monitor.c' object='xfce4_taskmanager-process-monitor.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-monitor.o `test -f 'process-monitor.c' || echo '$(srcdir)/'`process-monitor.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-monitor.o `test -f 'process-monitor.c' || echo '$(srcdir)/'`process-monitor.c xfce4_taskmanager-process-monitor.obj: process-monitor.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-monitor.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-monitor.Tpo -c -o xfce4_taskmanager-process-monitor.obj `if test -f 'process-monitor.c'; then $(CYGPATH_W) 'process-monitor.c'; else $(CYGPATH_W) '$(srcdir)/process-monitor.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-monitor.Tpo $(DEPDIR)/xfce4_taskmanager-process-monitor.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-monitor.c' object='xfce4_taskmanager-process-monitor.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-monitor.c' object='xfce4_taskmanager-process-monitor.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-monitor.obj `if test -f 'process-monitor.c'; then $(CYGPATH_W) 'process-monitor.c'; else $(CYGPATH_W) '$(srcdir)/process-monitor.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-monitor.obj `if test -f 'process-monitor.c'; then $(CYGPATH_W) 'process-monitor.c'; else $(CYGPATH_W) '$(srcdir)/process-monitor.c'; fi` xfce4_taskmanager-process-tree-view.o: process-tree-view.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-tree-view.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-tree-view.Tpo -c -o xfce4_taskmanager-process-tree-view.o `test -f 'process-tree-view.c' || echo '$(srcdir)/'`process-tree-view.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-tree-view.Tpo $(DEPDIR)/xfce4_taskmanager-process-tree-view.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-tree-view.c' object='xfce4_taskmanager-process-tree-view.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-tree-view.c' object='xfce4_taskmanager-process-tree-view.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-tree-view.o `test -f 'process-tree-view.c' || echo '$(srcdir)/'`process-tree-view.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-tree-view.o `test -f 'process-tree-view.c' || echo '$(srcdir)/'`process-tree-view.c xfce4_taskmanager-process-tree-view.obj: process-tree-view.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-tree-view.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-tree-view.Tpo -c -o xfce4_taskmanager-process-tree-view.obj `if test -f 'process-tree-view.c'; then $(CYGPATH_W) 'process-tree-view.c'; else $(CYGPATH_W) '$(srcdir)/process-tree-view.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-tree-view.Tpo $(DEPDIR)/xfce4_taskmanager-process-tree-view.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-tree-view.c' object='xfce4_taskmanager-process-tree-view.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-tree-view.c' object='xfce4_taskmanager-process-tree-view.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-tree-view.obj `if test -f 'process-tree-view.c'; then $(CYGPATH_W) 'process-tree-view.c'; else $(CYGPATH_W) '$(srcdir)/process-tree-view.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-tree-view.obj `if test -f 'process-tree-view.c'; then $(CYGPATH_W) 'process-tree-view.c'; else $(CYGPATH_W) '$(srcdir)/process-tree-view.c'; fi` xfce4_taskmanager-process-statusbar.o: process-statusbar.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-statusbar.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-statusbar.Tpo -c -o xfce4_taskmanager-process-statusbar.o `test -f 'process-statusbar.c' || echo '$(srcdir)/'`process-statusbar.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-statusbar.Tpo $(DEPDIR)/xfce4_taskmanager-process-statusbar.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-statusbar.c' object='xfce4_taskmanager-process-statusbar.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-statusbar.c' object='xfce4_taskmanager-process-statusbar.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-statusbar.o `test -f 'process-statusbar.c' || echo '$(srcdir)/'`process-statusbar.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-statusbar.o `test -f 'process-statusbar.c' || echo '$(srcdir)/'`process-statusbar.c xfce4_taskmanager-process-statusbar.obj: process-statusbar.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-process-statusbar.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-process-statusbar.Tpo -c -o xfce4_taskmanager-process-statusbar.obj `if test -f 'process-statusbar.c'; then $(CYGPATH_W) 'process-statusbar.c'; else $(CYGPATH_W) '$(srcdir)/process-statusbar.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-process-statusbar.Tpo $(DEPDIR)/xfce4_taskmanager-process-statusbar.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process-statusbar.c' object='xfce4_taskmanager-process-statusbar.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='process-statusbar.c' object='xfce4_taskmanager-process-statusbar.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-statusbar.obj `if test -f 'process-statusbar.c'; then $(CYGPATH_W) 'process-statusbar.c'; else $(CYGPATH_W) '$(srcdir)/process-statusbar.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-process-statusbar.obj `if test -f 'process-statusbar.c'; then $(CYGPATH_W) 'process-statusbar.c'; else $(CYGPATH_W) '$(srcdir)/process-statusbar.c'; fi` -xfce4_taskmanager-task-manager.o: task-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo -c -o xfce4_taskmanager-task-manager.o `test -f 'task-manager.c' || echo '$(srcdir)/'`task-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager.c' object='xfce4_taskmanager-task-manager.o' libtool=no @AMDEPBACKSLASH@ +xfce4_taskmanager-exec-tool-button.o: exec-tool-button.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-exec-tool-button.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-exec-tool-button.Tpo -c -o xfce4_taskmanager-exec-tool-button.o `test -f 'exec-tool-button.c' || echo '$(srcdir)/'`exec-tool-button.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-exec-tool-button.Tpo $(DEPDIR)/xfce4_taskmanager-exec-tool-button.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exec-tool-button.c' object='xfce4_taskmanager-exec-tool-button.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager.o `test -f 'task-manager.c' || echo '$(srcdir)/'`task-manager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-exec-tool-button.o `test -f 'exec-tool-button.c' || echo '$(srcdir)/'`exec-tool-button.c -xfce4_taskmanager-task-manager.obj: task-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo -c -o xfce4_taskmanager-task-manager.obj `if test -f 'task-manager.c'; then $(CYGPATH_W) 'task-manager.c'; else $(CYGPATH_W) '$(srcdir)/task-manager.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager.c' object='xfce4_taskmanager-task-manager.obj' libtool=no @AMDEPBACKSLASH@ +xfce4_taskmanager-exec-tool-button.obj: exec-tool-button.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-exec-tool-button.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-exec-tool-button.Tpo -c -o xfce4_taskmanager-exec-tool-button.obj `if test -f 'exec-tool-button.c'; then $(CYGPATH_W) 'exec-tool-button.c'; else $(CYGPATH_W) '$(srcdir)/exec-tool-button.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-exec-tool-button.Tpo $(DEPDIR)/xfce4_taskmanager-exec-tool-button.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exec-tool-button.c' object='xfce4_taskmanager-exec-tool-button.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) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-exec-tool-button.obj `if test -f 'exec-tool-button.c'; then $(CYGPATH_W) 'exec-tool-button.c'; else $(CYGPATH_W) '$(srcdir)/exec-tool-button.c'; fi` + +xfce4_taskmanager-settings-tool-button.o: settings-tool-button.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-settings-tool-button.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-settings-tool-button.Tpo -c -o xfce4_taskmanager-settings-tool-button.o `test -f 'settings-tool-button.c' || echo '$(srcdir)/'`settings-tool-button.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-settings-tool-button.Tpo $(DEPDIR)/xfce4_taskmanager-settings-tool-button.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='settings-tool-button.c' object='xfce4_taskmanager-settings-tool-button.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) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings-tool-button.o `test -f 'settings-tool-button.c' || echo '$(srcdir)/'`settings-tool-button.c + +xfce4_taskmanager-settings-tool-button.obj: settings-tool-button.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-settings-tool-button.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-settings-tool-button.Tpo -c -o xfce4_taskmanager-settings-tool-button.obj `if test -f 'settings-tool-button.c'; then $(CYGPATH_W) 'settings-tool-button.c'; else $(CYGPATH_W) '$(srcdir)/settings-tool-button.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-settings-tool-button.Tpo $(DEPDIR)/xfce4_taskmanager-settings-tool-button.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='settings-tool-button.c' object='xfce4_taskmanager-settings-tool-button.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) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings-tool-button.obj `if test -f 'settings-tool-button.c'; then $(CYGPATH_W) 'settings-tool-button.c'; else $(CYGPATH_W) '$(srcdir)/settings-tool-button.c'; fi` + +xfce4_taskmanager-settings-dialog.o: settings-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-settings-dialog.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-settings-dialog.Tpo -c -o xfce4_taskmanager-settings-dialog.o `test -f 'settings-dialog.c' || echo '$(srcdir)/'`settings-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-settings-dialog.Tpo $(DEPDIR)/xfce4_taskmanager-settings-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='settings-dialog.c' object='xfce4_taskmanager-settings-dialog.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) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings-dialog.o `test -f 'settings-dialog.c' || echo '$(srcdir)/'`settings-dialog.c + +xfce4_taskmanager-settings-dialog.obj: settings-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-settings-dialog.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-settings-dialog.Tpo -c -o xfce4_taskmanager-settings-dialog.obj `if test -f 'settings-dialog.c'; then $(CYGPATH_W) 'settings-dialog.c'; else $(CYGPATH_W) '$(srcdir)/settings-dialog.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-settings-dialog.Tpo $(DEPDIR)/xfce4_taskmanager-settings-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='settings-dialog.c' object='xfce4_taskmanager-settings-dialog.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager.obj `if test -f 'task-manager.c'; then $(CYGPATH_W) 'task-manager.c'; else $(CYGPATH_W) '$(srcdir)/task-manager.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings-dialog.obj `if test -f 'settings-dialog.c'; then $(CYGPATH_W) 'settings-dialog.c'; else $(CYGPATH_W) '$(srcdir)/settings-dialog.c'; fi` xfce4_taskmanager-settings.o: settings.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-settings.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-settings.Tpo -c -o xfce4_taskmanager-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-settings.Tpo $(DEPDIR)/xfce4_taskmanager-settings.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfce4_taskmanager-settings.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='settings.c' object='xfce4_taskmanager-settings.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c xfce4_taskmanager-settings.obj: settings.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-settings.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-settings.Tpo -c -o xfce4_taskmanager-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-settings.Tpo $(DEPDIR)/xfce4_taskmanager-settings.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfce4_taskmanager-settings.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='settings.c' object='xfce4_taskmanager-settings.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi` + +xfce4_taskmanager-task-manager.o: task-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo -c -o xfce4_taskmanager-task-manager.o `test -f 'task-manager.c' || echo '$(srcdir)/'`task-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager.c' object='xfce4_taskmanager-task-manager.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) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager.o `test -f 'task-manager.c' || echo '$(srcdir)/'`task-manager.c + +xfce4_taskmanager-task-manager.obj: task-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo -c -o xfce4_taskmanager-task-manager.obj `if test -f 'task-manager.c'; then $(CYGPATH_W) 'task-manager.c'; else $(CYGPATH_W) '$(srcdir)/task-manager.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager.c' object='xfce4_taskmanager-task-manager.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) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager.obj `if test -f 'task-manager.c'; then $(CYGPATH_W) 'task-manager.c'; else $(CYGPATH_W) '$(srcdir)/task-manager.c'; fi` xfce4_taskmanager-app-manager.o: app-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-app-manager.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-app-manager.Tpo -c -o xfce4_taskmanager-app-manager.o `test -f 'app-manager.c' || echo '$(srcdir)/'`app-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-app-manager.Tpo $(DEPDIR)/xfce4_taskmanager-app-manager.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='app-manager.c' object='xfce4_taskmanager-app-manager.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='app-manager.c' object='xfce4_taskmanager-app-manager.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-app-manager.o `test -f 'app-manager.c' || echo '$(srcdir)/'`app-manager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-app-manager.o `test -f 'app-manager.c' || echo '$(srcdir)/'`app-manager.c xfce4_taskmanager-app-manager.obj: app-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-app-manager.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-app-manager.Tpo -c -o xfce4_taskmanager-app-manager.obj `if test -f 'app-manager.c'; then $(CYGPATH_W) 'app-manager.c'; else $(CYGPATH_W) '$(srcdir)/app-manager.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-app-manager.Tpo $(DEPDIR)/xfce4_taskmanager-app-manager.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='app-manager.c' object='xfce4_taskmanager-app-manager.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='app-manager.c' object='xfce4_taskmanager-app-manager.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-app-manager.obj `if test -f 'app-manager.c'; then $(CYGPATH_W) 'app-manager.c'; else $(CYGPATH_W) '$(srcdir)/app-manager.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-app-manager.obj `if test -f 'app-manager.c'; then $(CYGPATH_W) 'app-manager.c'; else $(CYGPATH_W) '$(srcdir)/app-manager.c'; fi` xfce4_taskmanager-task-manager-freebsd.o: task-manager-freebsd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-freebsd.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-freebsd.Tpo -c -o xfce4_taskmanager-task-manager-freebsd.o `test -f 'task-manager-freebsd.c' || echo '$(srcdir)/'`task-manager-freebsd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-freebsd.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-freebsd.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-freebsd.c' object='xfce4_taskmanager-task-manager-freebsd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-freebsd.c' object='xfce4_taskmanager-task-manager-freebsd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-freebsd.o `test -f 'task-manager-freebsd.c' || echo '$(srcdir)/'`task-manager-freebsd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-freebsd.o `test -f 'task-manager-freebsd.c' || echo '$(srcdir)/'`task-manager-freebsd.c xfce4_taskmanager-task-manager-freebsd.obj: task-manager-freebsd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-freebsd.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-freebsd.Tpo -c -o xfce4_taskmanager-task-manager-freebsd.obj `if test -f 'task-manager-freebsd.c'; then $(CYGPATH_W) 'task-manager-freebsd.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-freebsd.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-freebsd.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-freebsd.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-freebsd.c' object='xfce4_taskmanager-task-manager-freebsd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-freebsd.c' object='xfce4_taskmanager-task-manager-freebsd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-freebsd.obj `if test -f 'task-manager-freebsd.c'; then $(CYGPATH_W) 'task-manager-freebsd.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-freebsd.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-freebsd.obj `if test -f 'task-manager-freebsd.c'; then $(CYGPATH_W) 'task-manager-freebsd.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-freebsd.c'; fi` xfce4_taskmanager-task-manager-bsd.o: task-manager-bsd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-bsd.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-bsd.Tpo -c -o xfce4_taskmanager-task-manager-bsd.o `test -f 'task-manager-bsd.c' || echo '$(srcdir)/'`task-manager-bsd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-bsd.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-bsd.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-bsd.c' object='xfce4_taskmanager-task-manager-bsd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-bsd.c' object='xfce4_taskmanager-task-manager-bsd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-bsd.o `test -f 'task-manager-bsd.c' || echo '$(srcdir)/'`task-manager-bsd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-bsd.o `test -f 'task-manager-bsd.c' || echo '$(srcdir)/'`task-manager-bsd.c xfce4_taskmanager-task-manager-bsd.obj: task-manager-bsd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-bsd.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-bsd.Tpo -c -o xfce4_taskmanager-task-manager-bsd.obj `if test -f 'task-manager-bsd.c'; then $(CYGPATH_W) 'task-manager-bsd.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-bsd.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-bsd.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-bsd.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-bsd.c' object='xfce4_taskmanager-task-manager-bsd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-bsd.c' object='xfce4_taskmanager-task-manager-bsd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-bsd.obj `if test -f 'task-manager-bsd.c'; then $(CYGPATH_W) 'task-manager-bsd.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-bsd.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-bsd.obj `if test -f 'task-manager-bsd.c'; then $(CYGPATH_W) 'task-manager-bsd.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-bsd.c'; fi` xfce4_taskmanager-task-manager-solaris.o: task-manager-solaris.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-solaris.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-solaris.Tpo -c -o xfce4_taskmanager-task-manager-solaris.o `test -f 'task-manager-solaris.c' || echo '$(srcdir)/'`task-manager-solaris.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-solaris.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-solaris.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-solaris.c' object='xfce4_taskmanager-task-manager-solaris.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-solaris.c' object='xfce4_taskmanager-task-manager-solaris.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-solaris.o `test -f 'task-manager-solaris.c' || echo '$(srcdir)/'`task-manager-solaris.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-solaris.o `test -f 'task-manager-solaris.c' || echo '$(srcdir)/'`task-manager-solaris.c xfce4_taskmanager-task-manager-solaris.obj: task-manager-solaris.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-solaris.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-solaris.Tpo -c -o xfce4_taskmanager-task-manager-solaris.obj `if test -f 'task-manager-solaris.c'; then $(CYGPATH_W) 'task-manager-solaris.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-solaris.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-solaris.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-solaris.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-solaris.c' object='xfce4_taskmanager-task-manager-solaris.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-solaris.c' object='xfce4_taskmanager-task-manager-solaris.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-solaris.obj `if test -f 'task-manager-solaris.c'; then $(CYGPATH_W) 'task-manager-solaris.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-solaris.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-solaris.obj `if test -f 'task-manager-solaris.c'; then $(CYGPATH_W) 'task-manager-solaris.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-solaris.c'; fi` xfce4_taskmanager-task-manager-linux.o: task-manager-linux.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-linux.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-linux.Tpo -c -o xfce4_taskmanager-task-manager-linux.o `test -f 'task-manager-linux.c' || echo '$(srcdir)/'`task-manager-linux.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-linux.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-linux.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-linux.c' object='xfce4_taskmanager-task-manager-linux.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-linux.c' object='xfce4_taskmanager-task-manager-linux.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-linux.o `test -f 'task-manager-linux.c' || echo '$(srcdir)/'`task-manager-linux.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-linux.o `test -f 'task-manager-linux.c' || echo '$(srcdir)/'`task-manager-linux.c xfce4_taskmanager-task-manager-linux.obj: task-manager-linux.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-linux.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-linux.Tpo -c -o xfce4_taskmanager-task-manager-linux.obj `if test -f 'task-manager-linux.c'; then $(CYGPATH_W) 'task-manager-linux.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-linux.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-linux.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-linux.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-linux.c' object='xfce4_taskmanager-task-manager-linux.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-linux.c' object='xfce4_taskmanager-task-manager-linux.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-linux.obj `if test -f 'task-manager-linux.c'; then $(CYGPATH_W) 'task-manager-linux.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-linux.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-linux.obj `if test -f 'task-manager-linux.c'; then $(CYGPATH_W) 'task-manager-linux.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-linux.c'; fi` xfce4_taskmanager-task-manager-skel.o: task-manager-skel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-skel.o -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-skel.Tpo -c -o xfce4_taskmanager-task-manager-skel.o `test -f 'task-manager-skel.c' || echo '$(srcdir)/'`task-manager-skel.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-skel.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-skel.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-skel.c' object='xfce4_taskmanager-task-manager-skel.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-skel.c' object='xfce4_taskmanager-task-manager-skel.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-skel.o `test -f 'task-manager-skel.c' || echo '$(srcdir)/'`task-manager-skel.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-skel.o `test -f 'task-manager-skel.c' || echo '$(srcdir)/'`task-manager-skel.c xfce4_taskmanager-task-manager-skel.obj: task-manager-skel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -MT xfce4_taskmanager-task-manager-skel.obj -MD -MP -MF $(DEPDIR)/xfce4_taskmanager-task-manager-skel.Tpo -c -o xfce4_taskmanager-task-manager-skel.obj `if test -f 'task-manager-skel.c'; then $(CYGPATH_W) 'task-manager-skel.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-skel.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_taskmanager-task-manager-skel.Tpo $(DEPDIR)/xfce4_taskmanager-task-manager-skel.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='task-manager-skel.c' object='xfce4_taskmanager-task-manager-skel.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='task-manager-skel.c' object='xfce4_taskmanager-task-manager-skel.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-skel.obj `if test -f 'task-manager-skel.c'; then $(CYGPATH_W) 'task-manager-skel.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-skel.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_taskmanager_CFLAGS) $(CFLAGS) -c -o xfce4_taskmanager-task-manager-skel.obj `if test -f 'task-manager-skel.c'; then $(CYGPATH_W) 'task-manager-skel.c'; else $(CYGPATH_W) '$(srcdir)/task-manager-skel.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -645,26 +770,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -676,15 +790,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -693,6 +803,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -746,10 +871,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -834,22 +964,24 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags 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-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps 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 uninstall uninstall-am \ - uninstall-binPROGRAMS +.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 \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps 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 @MAINTAINER_MODE_TRUE@process-window_ui.h: process-window.ui @MAINTAINER_MODE_TRUE@ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=process_window_ui $< >$@ +@MAINTAINER_MODE_TRUE@settings-dialog_ui.h: settings-dialog.ui +@MAINTAINER_MODE_TRUE@ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=settings_dialog_ui $< >$@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru xfce4-taskmanager-1.0.0/src/app-manager.h xfce4-taskmanager-1.0.1/src/app-manager.h --- xfce4-taskmanager-1.0.0/src/app-manager.h 2010-06-04 13:31:43.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/app-manager.h 2014-01-08 18:42:02.000000000 +0000 @@ -38,7 +38,7 @@ typedef struct _XtmAppManager XtmAppManager; GType xtm_app_manager_get_type (void); -XtmAppManager * xtm_app_manager_new (); +XtmAppManager * xtm_app_manager_new (void); const GArray * xtm_app_manager_get_app_list (XtmAppManager *manager); App * xtm_app_manager_get_app_from_pid (XtmAppManager *manager, gint pid); diff -Nru xfce4-taskmanager-1.0.0/src/exec-tool-button.c xfce4-taskmanager-1.0.1/src/exec-tool-button.c --- xfce4-taskmanager-1.0.0/src/exec-tool-button.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/exec-tool-button.c 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,201 @@ +/* + * Copyright (c) 2010 Mike Massonnet, + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#ifdef HAVE_GKSU +#include +#endif + +#include "exec-tool-button.h" + + + +typedef struct _XtmExecToolButtonClass XtmExecToolButtonClass; +struct _XtmExecToolButtonClass +{ + GtkMenuToolButtonClass parent_class; +}; +struct _XtmExecToolButton +{ + GtkMenuToolButton parent; + /**/ +}; +G_DEFINE_TYPE (XtmExecToolButton, xtm_exec_tool_button, GTK_TYPE_MENU_TOOL_BUTTON) + +static GtkWidget * construct_menu (void); +static void execute_default_command (void); + + + +static void +xtm_exec_tool_button_class_init (XtmExecToolButtonClass *klass) +{ + xtm_exec_tool_button_parent_class = g_type_class_peek_parent (klass); +} + +static void +xtm_exec_tool_button_init (XtmExecToolButton *button) +{ + GtkWidget *menu; + + gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (button), "gtk-execute"); + gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (button), TRUE); + + menu = construct_menu (); + gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (button), menu); + g_signal_connect (button, "clicked", G_CALLBACK (execute_default_command), NULL); + + gtk_widget_show_all (GTK_WIDGET (button)); +} + + + +#ifdef HAVE_GKSU +static void +run_as_root (GtkWidget *mi) +{ + // TODO hide status icon + GtkWidget *window = gtk_widget_get_toplevel (mi); + gtk_widget_hide (window); + gksu_run (g_get_prgname (), NULL); + gtk_widget_show (window); +} +#endif + +static void +execute_command (const gchar *command) +{ + GError *error = NULL; + + gdk_spawn_command_line_on_screen (gdk_screen_get_default (), command, &error); + if (error != NULL) + { + GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + _("Execution error")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); + gtk_window_set_title (GTK_WINDOW (dialog), _("Task Manager")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + g_error_free (error); + } +} + +static gboolean +program_exists (gchar *program) +{ + gchar *program_path = g_find_program_in_path (program); + if (program_path == NULL) + return FALSE; + g_free (program_path); + return TRUE; +} + +static void +execute_default_command (void) +{ + static gchar *command = NULL; + + if (command == NULL) + { + /* Find a runner program */ + if (program_exists ("xfrun4")) + command = g_strdup ("xfrun4"); + else if (program_exists ("gmrun")) + command = g_strdup ("gmrun"); + else if (program_exists ("gexec")) + command = g_strdup ("gexec"); + /* Find an applications-listing program */ + else if (program_exists ("xfce4-appfinder")) + command = g_strdup ("xfce4-appfinder"); + /* Find a terminal emulator */ + else if (program_exists ("exo-open")) + command = g_strdup ("exo-open --launch TerminalEmulator"); + else if (program_exists ("xterm")) + command = g_strdup ("xterm -fg grey -bg black"); + else + { + GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + _("Execution error")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("Couldn't find any default command to run.")); + gtk_window_set_title (GTK_WINDOW (dialog), _("Task Manager")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + return; + } + } + + execute_command (command); +} + +static void +menu_append_item (GtkMenu *menu, gchar *title, gchar *command, gchar *icon_name) +{ + GtkWidget *image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + GtkWidget *mi = gtk_image_menu_item_new_with_label (title); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + g_signal_connect_swapped (mi, "activate", G_CALLBACK (execute_command), command); +} + +static inline GtkWidget * +construct_menu (void) +{ + GtkWidget *menu = gtk_menu_new (); + +#ifdef HAVE_GKSU + /* Run task manager as root */ + if (geteuid () != 0) + { + GtkWidget *image = gtk_image_new_from_icon_name ("utilities-system-monitor", GTK_ICON_SIZE_MENU); + GtkWidget *mi = gtk_image_menu_item_new_with_label (_("Run Task Manager as root")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + g_signal_connect (mi, "activate", G_CALLBACK (run_as_root), NULL); + mi = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + } +#endif + + /* Find a runner program */ + if (program_exists ("xfrun4")) + menu_append_item (GTK_MENU (menu), _("Run Program..."), "xfrun4", "gtk-execute"); + else if (program_exists ("gmrun")) + menu_append_item (GTK_MENU (menu), _("Run Program..."), "gmrun", "gtk-execute"); + else if (program_exists ("gexec")) + menu_append_item (GTK_MENU (menu), _("Run Program..."), "gexec", "gtk-execute"); + /* Find an applications-listing program */ + if (program_exists ("xfce4-appfinder")) + menu_append_item (GTK_MENU (menu), _("Application Finder"), "xfce4-appfinder", "xfce4-appfinder"); + /* Find a terminal emulator */ + if (program_exists ("exo-open")) + menu_append_item (GTK_MENU (menu), _("Terminal emulator"), "exo-open --launch TerminalEmulator", "terminal"); + else if (program_exists ("xterm")) + menu_append_item (GTK_MENU (menu), _("XTerm"), "xterm -fg grey -bg black", "terminal"); + + gtk_widget_show_all (menu); + + return menu; +} + + + +GtkWidget * +xtm_exec_tool_button_new (void) +{ + return g_object_new (XTM_TYPE_EXEC_TOOL_BUTTON, NULL); +} + diff -Nru xfce4-taskmanager-1.0.0/src/exec-tool-button.h xfce4-taskmanager-1.0.1/src/exec-tool-button.h --- xfce4-taskmanager-1.0.0/src/exec-tool-button.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/exec-tool-button.h 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2010 Mike Massonnet, + * + * 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. + */ + +#ifndef EXEC_TOOL_BUTTON_H +#define EXEC_TOOL_BUTTON_H + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#define XTM_TYPE_EXEC_TOOL_BUTTON (xtm_exec_tool_button_get_type ()) +#define XTM_EXEC_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XTM_TYPE_EXEC_TOOL_BUTTON, XtmExecToolButton)) +#define XTM_EXEC_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XTM_TYPE_EXEC_TOOL_BUTTON, XtmExecToolButtonClass)) +#define XTM_IS_EXEC_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XTM_TYPE_EXEC_TOOL_BUTTON)) +#define XTM_IS_EXEC_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XTM_TYPE_EXEC_TOOL_BUTTON)) +#define XTM_EXEC_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XTM_TYPE_EXEC_TOOL_BUTTON, XtmExecToolButtonClass)) + +typedef struct _XtmExecToolButton XtmExecToolButton; + +GType xtm_exec_tool_button_get_type (void); +GtkWidget * xtm_exec_tool_button_new (void); + +#endif /* !EXEC_TOOL_BUTTON_H */ diff -Nru xfce4-taskmanager-1.0.0/src/process-monitor.c xfce4-taskmanager-1.0.1/src/process-monitor.c --- xfce4-taskmanager-1.0.0/src/process-monitor.c 2010-06-13 15:33:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-monitor.c 2014-01-08 18:42:02.000000000 +0000 @@ -24,6 +24,7 @@ PROP_COLOR_RED, PROP_COLOR_GREEN, PROP_COLOR_BLUE, + PROP_PAINT_BOX, }; typedef struct _XtmProcessMonitorClass XtmProcessMonitorClass; struct _XtmProcessMonitorClass @@ -39,6 +40,7 @@ gfloat color_red; gfloat color_green; gfloat color_blue; + gboolean paint_box; }; G_DEFINE_TYPE (XtmProcessMonitor, xtm_process_monitor, GTK_TYPE_DRAWING_AREA) @@ -66,6 +68,8 @@ g_param_spec_float ("color-green", "ColorGreen", "Color green", 0, 1, 0, G_PARAM_READWRITE)); g_object_class_install_property (class, PROP_COLOR_BLUE, g_param_spec_float ("color-blue", "ColorBlue", "Color blue", 0, 1, 0, G_PARAM_READWRITE)); + g_object_class_install_property (class, PROP_PAINT_BOX, + g_param_spec_boolean ("paint-box", "PaintBox", "Paint box around monitor", TRUE, G_PARAM_CONSTRUCT|G_PARAM_READWRITE)); } static void @@ -106,6 +110,10 @@ g_value_set_float (value, monitor->color_blue); break; + case PROP_PAINT_BOX: + g_value_set_boolean (value, monitor->paint_box); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -134,6 +142,10 @@ monitor->color_blue = g_value_get_float (value); break; + case PROP_PAINT_BOX: + monitor->paint_box = g_value_get_boolean (value); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -235,8 +247,9 @@ height = GTK_WIDGET (monitor)->allocation.height; /* Paint a box */ - gtk_paint_box (GTK_WIDGET (monitor)->style, GTK_WIDGET (monitor)->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, - NULL, GTK_WIDGET (monitor), "trough", 0, 0, width, height); + if (monitor->paint_box) + gtk_paint_box (GTK_WIDGET (monitor)->style, GTK_WIDGET (monitor)->window, GTK_STATE_PRELIGHT, GTK_SHADOW_IN, + NULL, GTK_WIDGET (monitor), "trough", 0, 0, width, height); /* Paint the graph */ graph_surface = xtm_process_monitor_graph_surface_create (monitor); @@ -272,8 +285,9 @@ cairo_stroke (cr); /* Repaint a shadow on top of everything to clear corners */ - gtk_paint_shadow (GTK_WIDGET (monitor)->style, GTK_WIDGET (monitor)->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, - NULL, GTK_WIDGET (monitor), "trough", 0, 0, width, height); + if (monitor->paint_box) + gtk_paint_shadow (GTK_WIDGET (monitor)->style, GTK_WIDGET (monitor)->window, GTK_STATE_PRELIGHT, GTK_SHADOW_IN, + NULL, GTK_WIDGET (monitor), "trough", 0, 0, width, height); cairo_destroy (cr); } @@ -326,3 +340,11 @@ gdk_window_invalidate_rect (GTK_WIDGET (monitor)->window, NULL, FALSE); } +void +xtm_process_monitor_set_paint_box (XtmProcessMonitor *monitor, gboolean paint_box) +{ + g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor)); + g_object_set (monitor, "paint-box", paint_box, NULL); + if (GDK_IS_WINDOW (GTK_WIDGET (monitor)->window)) + gdk_window_invalidate_rect (GTK_WIDGET (monitor)->window, NULL, FALSE); +} diff -Nru xfce4-taskmanager-1.0.0/src/process-monitor.h xfce4-taskmanager-1.0.1/src/process-monitor.h --- xfce4-taskmanager-1.0.0/src/process-monitor.h 2010-06-13 14:17:29.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-monitor.h 2014-01-08 18:42:02.000000000 +0000 @@ -31,5 +31,6 @@ void xtm_process_monitor_set_step_size (XtmProcessMonitor *monitor, gfloat step_size); void xtm_process_monitor_clear (XtmProcessMonitor *monitor); void xtm_process_monitor_set_source_color (XtmProcessMonitor *monitor, gdouble red, gdouble green, gdouble blue); +void xtm_process_monitor_set_paint_box (XtmProcessMonitor *monitor, gboolean paint_box); #endif /* !PROCESS_MONITOR_H */ diff -Nru xfce4-taskmanager-1.0.0/src/process-statusbar.h xfce4-taskmanager-1.0.1/src/process-statusbar.h --- xfce4-taskmanager-1.0.0/src/process-statusbar.h 2010-05-02 14:59:49.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-statusbar.h 2014-01-08 18:42:02.000000000 +0000 @@ -27,6 +27,6 @@ typedef struct _XtmProcessStatusbar XtmProcessStatusbar; GType xtm_process_statusbar_get_type (void); -GtkWidget * xtm_process_statusbar_new (); +GtkWidget * xtm_process_statusbar_new (void); #endif /* !PROCESS_STATUSBAR_H */ diff -Nru xfce4-taskmanager-1.0.0/src/process-tree-view.c xfce4-taskmanager-1.0.1/src/process-tree-view.c --- xfce4-taskmanager-1.0.0/src/process-tree-view.c 2010-06-10 00:52:32.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-tree-view.c 2014-01-08 18:42:02.000000000 +0000 @@ -60,6 +60,7 @@ static gboolean treeview_clicked (XtmProcessTreeView *treeview, GdkEventButton *event); static gboolean treeview_key_pressed (XtmProcessTreeView *treeview, GdkEventKey *event); +static void column_task_pack_cells (XtmProcessTreeView *treeview, GtkTreeViewColumn *column); static void columns_changed (XtmProcessTreeView *treeview); static void read_columns_positions (XtmProcessTreeView *treeview); static void save_columns_positions (XtmProcessTreeView *treeview); @@ -81,11 +82,7 @@ static void xtm_process_tree_view_init (XtmProcessTreeView *treeview) { -#ifdef HAVE_WNCK - GtkCellRenderer *cell_text, *cell_right_aligned, *cell_icon, *cell_cmdline; -#else - GtkCellRenderer *cell_text, *cell_right_aligned, *cell_cmdline; -#endif + GtkCellRenderer *cell_text, *cell_right_aligned; GtkTreeViewColumn *column; gboolean visible; @@ -119,9 +116,6 @@ cell_right_aligned = gtk_cell_renderer_text_new (); g_object_set (cell_right_aligned, "xalign", 1.0, NULL); - cell_cmdline = gtk_cell_renderer_text_new (); - g_object_set (cell_cmdline, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - /* Retrieve initial tree view columns positions */ read_columns_positions (treeview); @@ -129,13 +123,7 @@ #define COLUMN_PROPERTIES "expand", TRUE, "clickable", TRUE, "reorderable", TRUE, "resizable", TRUE, "visible", TRUE column = gtk_tree_view_column_new (); gtk_tree_view_column_set_title (GTK_TREE_VIEW_COLUMN (column), _("Task")); -#ifdef HAVE_WNCK - cell_icon = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column), cell_icon, FALSE); - gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), cell_icon, "pixbuf", XTM_PTV_COLUMN_ICON, "cell-background", XTM_PTV_COLUMN_BACKGROUND, NULL); -#endif - gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column), cell_cmdline, TRUE); - gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), cell_cmdline, "text", XTM_PTV_COLUMN_COMMAND, "cell-background", XTM_PTV_COLUMN_BACKGROUND, "foreground", XTM_PTV_COLUMN_FOREGROUND, NULL); + column_task_pack_cells (treeview, column); g_object_set (column, COLUMN_PROPERTIES, NULL); g_object_set_data (G_OBJECT (column), "sort-column-id", GINT_TO_POINTER (XTM_PTV_COLUMN_COMMAND)); g_object_set_data (G_OBJECT (column), "column-id", GINT_TO_POINTER (COLUMN_COMMAND)); @@ -259,6 +247,28 @@ */ static void +column_task_pack_cells (XtmProcessTreeView *treeview, GtkTreeViewColumn *column) +{ + GtkCellRenderer *cell_cmdline, *cell_icon; + gboolean show_application_icons; + + g_object_get (treeview->settings, "show-application-icons", &show_application_icons, NULL); + if (show_application_icons) + { +#ifdef HAVE_WNCK + cell_icon = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column), cell_icon, FALSE); + gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), cell_icon, "pixbuf", XTM_PTV_COLUMN_ICON, "cell-background", XTM_PTV_COLUMN_BACKGROUND, NULL); +#endif + } + + cell_cmdline = gtk_cell_renderer_text_new (); + g_object_set (cell_cmdline, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column), cell_cmdline, TRUE); + gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), cell_cmdline, "text", XTM_PTV_COLUMN_COMMAND, "cell-background", XTM_PTV_COLUMN_BACKGROUND, "foreground", XTM_PTV_COLUMN_FOREGROUND, NULL); +} + +static void columns_changed (XtmProcessTreeView *treeview) { GList *columns, *l; @@ -325,11 +335,17 @@ static void cb_send_signal (GtkMenuItem *mi, gpointer user_data) { + XtmSettings *settings; + gboolean prompt_terminate_task; GtkWidget *dialog; guint pid = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (mi), "pid")); gint xtm_signal = GPOINTER_TO_INT (user_data); - if (xtm_signal == XTM_SIGNAL_TERMINATE || xtm_signal == XTM_SIGNAL_KILL) + settings = xtm_settings_get_default (); + g_object_get (settings, "prompt-terminate-task", &prompt_terminate_task, NULL); + g_object_unref (settings); + + if ((xtm_signal == XTM_SIGNAL_TERMINATE && prompt_terminate_task) || xtm_signal == XTM_SIGNAL_KILL) { gint res; dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, @@ -356,6 +372,15 @@ gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } + + if (xtm_signal == XTM_SIGNAL_TERMINATE || xtm_signal == XTM_SIGNAL_KILL) + { + GtkTreeSelection *selection; + GtkWidget *treeview; + treeview = g_object_get_data (G_OBJECT (mi), "treeview"); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + gtk_tree_selection_unselect_all (selection); + } } static void @@ -378,12 +403,18 @@ } static GtkWidget * -build_context_menu (guint pid) +build_context_menu (XtmProcessTreeView *treeview, guint pid) { GtkWidget *menu, *menu_priority, *mi; menu = gtk_menu_new (); + mi = gtk_menu_item_new_with_label (_("Terminate")); + g_object_set_data (G_OBJECT (mi), "pid", GUINT_TO_POINTER (pid)); + g_object_set_data (G_OBJECT (mi), "treeview", treeview); + gtk_container_add (GTK_CONTAINER (menu), mi); + g_signal_connect (mi, "activate", G_CALLBACK (cb_send_signal), GINT_TO_POINTER (XTM_SIGNAL_TERMINATE)); + if (!pid_is_sleeping (pid)) { mi = gtk_menu_item_new_with_label (_("Stop")); @@ -404,11 +435,6 @@ gtk_container_add (GTK_CONTAINER (menu), mi); g_signal_connect (mi, "activate", G_CALLBACK (cb_send_signal), GINT_TO_POINTER (XTM_SIGNAL_KILL)); - mi = gtk_menu_item_new_with_label (_("Terminate")); - g_object_set_data (G_OBJECT (mi), "pid", GUINT_TO_POINTER (pid)); - gtk_container_add (GTK_CONTAINER (menu), mi); - g_signal_connect (mi, "activate", G_CALLBACK (cb_send_signal), GINT_TO_POINTER (XTM_SIGNAL_TERMINATE)); - menu_priority = gtk_menu_new (); mi = gtk_menu_item_new_with_label (_("Very low")); @@ -466,7 +492,7 @@ if (menu != NULL) gtk_widget_destroy (menu); - menu = build_context_menu (pid); + menu = build_context_menu (treeview, pid); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, position_func, treeview, 1, activate_time); } @@ -623,6 +649,13 @@ g_object_get (object, pspec->name, &visible, NULL); gtk_tree_view_column_set_visible (gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), treeview->columns_positions[column_id]), visible); } + else if (!g_strcmp0 (pspec->name, "show-application-icons")) + { + GtkTreeViewColumn *column; + column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), treeview->columns_positions[COLUMN_COMMAND]); + gtk_tree_view_column_clear (column); + column_task_pack_cells (treeview, column); + } else if (!g_strcmp0 (pspec->name, "show-all-processes")) { g_object_get (object, pspec->name, &treeview->show_all_processes_cached, NULL); diff -Nru xfce4-taskmanager-1.0.0/src/process-tree-view.h xfce4-taskmanager-1.0.1/src/process-tree-view.h --- xfce4-taskmanager-1.0.0/src/process-tree-view.h 2010-06-04 13:31:43.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-tree-view.h 2014-01-08 18:42:02.000000000 +0000 @@ -50,7 +50,7 @@ typedef struct _XtmProcessTreeView XtmProcessTreeView; GType xtm_process_tree_view_get_type (void); -GtkWidget * xtm_process_tree_view_new (); +GtkWidget * xtm_process_tree_view_new (void); void xtm_process_tree_view_get_sort_column_id (XtmProcessTreeView *treeview, gint *sort_column_id, GtkSortType *sort_type); #endif /* !PROCESS_TREE_VIEW_H */ diff -Nru xfce4-taskmanager-1.0.0/src/process-window.c xfce4-taskmanager-1.0.1/src/process-window.c --- xfce4-taskmanager-1.0.0/src/process-window.c 2010-06-13 15:59:12.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-window.c 2014-01-08 18:42:02.000000000 +0000 @@ -25,11 +25,12 @@ #include "process-monitor.h" #include "process-tree-view.h" #include "process-statusbar.h" +#include "exec-tool-button.h" +#include "settings-tool-button.h" typedef struct _XtmProcessWindowClass XtmProcessWindowClass; -typedef struct _XtmProcessWindowPriv XtmProcessWindowPriv; struct _XtmProcessWindowClass { GtkWidgetClass parent_class; @@ -38,19 +39,17 @@ { GtkWidget parent; /**/ - XtmProcessWindowPriv * priv; -}; -struct _XtmProcessWindowPriv -{ GtkBuilder * builder; GtkWidget * window; + GtkWidget * toolbar; GtkWidget * cpu_monitor; GtkWidget * mem_monitor; GtkWidget * treeview; GtkWidget * statusbar; + GtkWidget * exec_button; + GtkWidget * settings_button; XtmSettings * settings; }; -#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XTM_TYPE_PROCESS_WINDOW, XtmProcessWindowPriv)) G_DEFINE_TYPE (XtmProcessWindow, xtm_process_window, GTK_TYPE_WIDGET) static void xtm_process_window_finalize (GObject *object); @@ -59,9 +58,9 @@ static void emit_destroy_signal (XtmProcessWindow *window); static gboolean emit_delete_event_signal (XtmProcessWindow *window, GdkEvent *event); +static void toolbar_update_style (XtmProcessWindow *window); static void monitor_update_step_size (XtmProcessWindow *window); -static void show_menu_execute_task (XtmProcessWindow *window); -static void show_menu_preferences (XtmProcessWindow *window); +static void monitor_update_paint_box (XtmProcessWindow *window); static void show_about_dialog (XtmProcessWindow *window); @@ -72,7 +71,6 @@ GObjectClass *class; GtkWidgetClass *widget_class; - g_type_class_add_private (klass, sizeof (XtmProcessWindowPriv)); xtm_process_window_parent_class = g_type_class_peek_parent (klass); class = G_OBJECT_CLASS (klass); class->finalize = xtm_process_window_finalize; @@ -87,100 +85,107 @@ GtkWidget *button; gint width, height; - window->priv = GET_PRIV (window); - - window->priv->settings = xtm_settings_get_default (); + window->settings = xtm_settings_get_default (); - window->priv->builder = gtk_builder_new (); - gtk_builder_add_from_string (window->priv->builder, process_window_ui, process_window_ui_length, NULL); + window->builder = gtk_builder_new (); + gtk_builder_add_from_string (window->builder, process_window_ui, process_window_ui_length, NULL); - window->priv->window = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "process-window")); - g_object_get (window->priv->settings, "window-width", &width, "window-height", &height, NULL); + window->window = GTK_WIDGET (gtk_builder_get_object (window->builder, "process-window")); + g_object_get (window->settings, "window-width", &width, "window-height", &height, NULL); if (width >= 1 && height >= 1) - gtk_window_resize (GTK_WINDOW (window->priv->window), width, height); - g_signal_connect_swapped (window->priv->window, "destroy", G_CALLBACK (emit_destroy_signal), window); - g_signal_connect_swapped (window->priv->window, "delete-event", G_CALLBACK (emit_delete_event_signal), window); + gtk_window_resize (GTK_WINDOW (window->window), width, height); + g_signal_connect_swapped (window->window, "destroy", G_CALLBACK (emit_destroy_signal), window); + g_signal_connect_swapped (window->window, "delete-event", G_CALLBACK (emit_delete_event_signal), window); + + window->toolbar = GTK_WIDGET (gtk_builder_get_object (window->builder, "process-toolbar")); + g_signal_connect_swapped (window->settings, "notify::toolbar-style", G_CALLBACK (toolbar_update_style), window); + g_object_notify (G_OBJECT (window->settings), "toolbar-style"); + + window->exec_button = xtm_exec_tool_button_new (); + gtk_toolbar_insert (GTK_TOOLBAR (window->toolbar), GTK_TOOL_ITEM (window->exec_button), 0); + + window->settings_button = xtm_settings_tool_button_new (); + gtk_toolbar_insert (GTK_TOOLBAR (window->toolbar), GTK_TOOL_ITEM (window->settings_button), 1); { GtkWidget *toolitem; guint refresh_rate; - g_object_get (window->priv->settings, "refresh-rate", &refresh_rate, NULL); + g_object_get (window->settings, "refresh-rate", &refresh_rate, NULL); - toolitem = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "cpu-toolitem")); - window->priv->cpu_monitor = xtm_process_monitor_new (); - xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->priv->cpu_monitor), refresh_rate / 1000.0); - gtk_widget_show (window->priv->cpu_monitor); - gtk_container_add (GTK_CONTAINER (toolitem), window->priv->cpu_monitor); - - toolitem = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "mem-toolitem")); - window->priv->mem_monitor = xtm_process_monitor_new (); - xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->priv->mem_monitor), refresh_rate / 1000.0); - gtk_widget_show (window->priv->mem_monitor); - gtk_container_add (GTK_CONTAINER (toolitem), window->priv->mem_monitor); - - g_signal_connect_swapped (window->priv->settings, "notify::refresh-rate", G_CALLBACK (monitor_update_step_size), window); + toolitem = GTK_WIDGET (gtk_builder_get_object (window->builder, "cpu-toolitem")); + window->cpu_monitor = xtm_process_monitor_new (); + xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->cpu_monitor), refresh_rate / 1000.0); + gtk_widget_show (window->cpu_monitor); + gtk_container_add (GTK_CONTAINER (toolitem), window->cpu_monitor); + + toolitem = GTK_WIDGET (gtk_builder_get_object (window->builder, "mem-toolitem")); + window->mem_monitor = xtm_process_monitor_new (); + xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->mem_monitor), refresh_rate / 1000.0); + gtk_widget_show (window->mem_monitor); + gtk_container_add (GTK_CONTAINER (toolitem), window->mem_monitor); + + monitor_update_paint_box (window); + g_signal_connect_swapped (window->settings, "notify::monitor-paint-box", G_CALLBACK (monitor_update_paint_box), window); + g_signal_connect_swapped (window->settings, "notify::refresh-rate", G_CALLBACK (monitor_update_step_size), window); } + button = GTK_WIDGET (gtk_builder_get_object (window->builder, "toolbutton-about")); + g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_about_dialog), window); + if (geteuid () == 0) { gtk_rc_parse_string ("style\"root-warning-style\"{bg[NORMAL]=\"#b4254b\"\nfg[NORMAL]=\"#fefefe\"}\n" "widget\"GtkWindow.*.root-warning\"style\"root-warning-style\"\n" "widget\"GtkWindow.*.root-warning.GtkLabel\"style\"root-warning-style\""); - gtk_widget_set_name (GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "root-warning-ebox")), "root-warning"); - gtk_widget_show_all (GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "root-warning-box"))); + gtk_widget_set_name (GTK_WIDGET (gtk_builder_get_object (window->builder, "root-warning-ebox")), "root-warning"); + gtk_widget_show_all (GTK_WIDGET (gtk_builder_get_object (window->builder, "root-warning-box"))); } - window->priv->treeview = xtm_process_tree_view_new (); - gtk_widget_show (window->priv->treeview); - gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (window->priv->builder, "scrolledwindow")), window->priv->treeview); - - window->priv->statusbar = xtm_process_statusbar_new (); - gtk_widget_show (window->priv->statusbar); - gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (window->priv->builder, "process-vbox")), window->priv->statusbar, FALSE, FALSE, 0); - - button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-execute")); - g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_menu_execute_task), window); + window->treeview = xtm_process_tree_view_new (); + gtk_widget_show (window->treeview); + gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (window->builder, "scrolledwindow")), window->treeview); + + window->statusbar = xtm_process_statusbar_new (); + gtk_widget_show (window->statusbar); + gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (window->builder, "process-vbox")), window->statusbar, FALSE, FALSE, 0); - button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-preferences")); - g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_menu_preferences), window); - - button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-about")); - g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_about_dialog), window); - - button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-quit")); - g_signal_connect_swapped (button, "clicked", G_CALLBACK (emit_destroy_signal), window); - - g_object_unref (window->priv->builder); - window->priv->builder = NULL; + g_object_unref (window->builder); + window->builder = NULL; } static void xtm_process_window_finalize (GObject *object) { - XtmProcessWindowPriv *priv = XTM_PROCESS_WINDOW (object)->priv; + XtmProcessWindow *window = XTM_PROCESS_WINDOW (object); - if (GTK_IS_WINDOW (priv->window)) + if (GTK_IS_WINDOW (window->window)) { gint width, height; guint sort_column_id; GtkSortType sort_type; - gtk_window_get_size (GTK_WINDOW (priv->window), &width, &height); - xtm_process_tree_view_get_sort_column_id (XTM_PROCESS_TREE_VIEW (priv->treeview), (gint*)&sort_column_id, &sort_type); + gtk_window_get_size (GTK_WINDOW (window->window), &width, &height); + xtm_process_tree_view_get_sort_column_id (XTM_PROCESS_TREE_VIEW (window->treeview), (gint*)&sort_column_id, &sort_type); - g_object_set (priv->settings, "window-width", width, "window-height", height, + g_object_set (window->settings, "window-width", width, "window-height", height, "sort-column-id", sort_column_id, "sort-type", sort_type, NULL); } - if (GTK_IS_TREE_VIEW (priv->treeview)) - gtk_widget_destroy (priv->treeview); + if (GTK_IS_TREE_VIEW (window->treeview)) + gtk_widget_destroy (window->treeview); + + if (GTK_IS_STATUSBAR (window->statusbar)) + gtk_widget_destroy (window->statusbar); - if (GTK_IS_STATUSBAR (priv->statusbar)) - gtk_widget_destroy (priv->statusbar); + if (GTK_IS_TOOL_ITEM (window->exec_button)) + gtk_widget_destroy (window->exec_button); - if (XTM_IS_SETTINGS (priv->settings)) - g_object_unref (priv->settings); + if (GTK_IS_TOOL_ITEM (window->settings_button)) + gtk_widget_destroy (window->settings_button); + + if (XTM_IS_SETTINGS (window->settings)) + g_object_unref (window->settings); } /** @@ -202,188 +207,51 @@ } static void -monitor_update_step_size (XtmProcessWindow *window) +toolbar_update_style (XtmProcessWindow *window) { - guint refresh_rate; - g_object_get (window->priv->settings, "refresh-rate", &refresh_rate, NULL); - g_object_set (window->priv->cpu_monitor, "step-size", refresh_rate / 1000.0, NULL); - g_object_set (window->priv->mem_monitor, "step-size", refresh_rate / 1000.0, NULL); -} - -static void -execute_command (const gchar *command) -{ - GError *error = NULL; - - gdk_spawn_command_line_on_screen (gdk_screen_get_default (), command, &error); - if (error != NULL) + XtmToolbarStyle toolbar_style; + g_object_get (window->settings, "toolbar-style", &toolbar_style, NULL); + switch (toolbar_style) { - GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - _("Execution error")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); - gtk_window_set_title (GTK_WINDOW (dialog), _("Task Manager")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - g_error_free (error); + default: + case XTM_TOOLBAR_STYLE_DEFAULT: + gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->toolbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_unset_style (GTK_TOOLBAR (window->toolbar)); + break; + + case XTM_TOOLBAR_STYLE_SMALL: + gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->toolbar), GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_toolbar_set_style (GTK_TOOLBAR (window->toolbar), GTK_TOOLBAR_ICONS); + break; + + case XTM_TOOLBAR_STYLE_LARGE: + gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->toolbar), GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_toolbar_set_style (GTK_TOOLBAR (window->toolbar), GTK_TOOLBAR_ICONS); + break; + + case XTM_TOOLBAR_STYLE_TEXT: + gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->toolbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style (GTK_TOOLBAR (window->toolbar), GTK_TOOLBAR_BOTH); + break; } } static void -menu_execute_append_item (GtkMenu *menu, gchar *title, gchar *command, gchar *icon_name) -{ - GtkWidget *image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - GtkWidget *mi = gtk_image_menu_item_new_with_label (title); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); - g_signal_connect_swapped (mi, "activate", G_CALLBACK (execute_command), command); -} - -static gboolean -program_exists (gchar *program) -{ - gchar *program_path = g_find_program_in_path (program); - if (program_path == NULL) - return FALSE; - g_free (program_path); - return TRUE; -} - -static void -show_menu_execute_task (XtmProcessWindow *window) +monitor_update_paint_box (XtmProcessWindow *window) { - static GtkWidget *menu = NULL; - - if (menu == NULL) - { - menu = gtk_menu_new (); - /* Find a runner program */ - if (program_exists ("xfrun4")) - menu_execute_append_item (GTK_MENU (menu), _("Run Program..."), "xfrun4", "system-run"); - else if (program_exists ("gmrun")) - menu_execute_append_item (GTK_MENU (menu), _("Run Program..."), "gmrun", "system-run"); - else if (program_exists ("gexec")) - menu_execute_append_item (GTK_MENU (menu), _("Run Program..."), "gexec", "system-run"); - /* Find an applications list program */ - if (program_exists ("xfce4-appfinder")) - menu_execute_append_item (GTK_MENU (menu), _("Application Finder"), "xfce4-appfinder", "xfce4-appfinder"); - /* Find a terminal emulator */ - if (program_exists ("exo-open")) - menu_execute_append_item (GTK_MENU (menu), _("Terminal emulator"), "exo-open --launch TerminalEmulator", "terminal"); - else if (program_exists ("xterm")) - menu_execute_append_item (GTK_MENU (menu), _("XTerm"), "xterm -fg grey -bg black", "terminal"); - gtk_widget_show_all (menu); - } - - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ()); + gboolean paint_box; + g_object_get (window->settings, "monitor-paint-box", &paint_box, NULL); + xtm_process_monitor_set_paint_box (XTM_PROCESS_MONITOR (window->cpu_monitor), paint_box); + xtm_process_monitor_set_paint_box (XTM_PROCESS_MONITOR (window->mem_monitor), paint_box); } static void -refresh_rate_toggled (GtkCheckMenuItem *mi, XtmSettings *settings) -{ - guint refresh_rate = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (mi), "refresh-rate")); - g_object_set (settings, "refresh-rate", refresh_rate, NULL); -} - -static void -menu_refresh_rate_append_item (GtkMenu *menu, gchar *title, guint refresh_rate, XtmSettings *settings) -{ - GtkWidget *mi; - guint cur_refresh_rate; - - g_object_get (settings, "refresh-rate", &cur_refresh_rate, NULL); - - if (cur_refresh_rate == refresh_rate) - { - mi = gtk_radio_menu_item_new_with_label (NULL, title); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), TRUE); - } - else - { - mi = gtk_menu_item_new_with_label (title); - } - gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); - g_object_set_data (G_OBJECT (mi), "refresh-rate", GUINT_TO_POINTER (refresh_rate)); - g_signal_connect (mi, "activate", G_CALLBACK (refresh_rate_toggled), settings); -} - -static GtkWidget * -build_refresh_rate_menu (XtmSettings *settings) -{ - GtkWidget *menu; - - menu = gtk_menu_new (); - - /* TRANSLATORS: The next values are in seconds or milliseconds */ - menu_refresh_rate_append_item (GTK_MENU (menu), _("500ms"), 500, settings); - menu_refresh_rate_append_item (GTK_MENU (menu), _("750ms"), 750, settings); - menu_refresh_rate_append_item (GTK_MENU (menu), _("1s"), 1000, settings); - menu_refresh_rate_append_item (GTK_MENU (menu), _("2s"), 2000, settings); - menu_refresh_rate_append_item (GTK_MENU (menu), _("5s"), 5000, settings); - menu_refresh_rate_append_item (GTK_MENU (menu), _("10s"), 10000, settings); - - return menu; -} - -static void -preferences_toggled (GtkCheckMenuItem *mi, XtmSettings *settings) -{ - gboolean active = gtk_check_menu_item_get_active (mi); - gchar *setting_name = g_object_get_data (G_OBJECT (mi), "setting-name"); - g_object_set (settings, setting_name, active, NULL); -} - -static void -menu_preferences_append_item (GtkMenu *menu, gchar *title, gchar *setting_name, XtmSettings *settings) -{ - GtkWidget *mi; - gboolean active = FALSE; - - g_object_get (settings, setting_name, &active, NULL); - - mi = gtk_check_menu_item_new_with_label (title); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), active); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); - g_object_set_data (G_OBJECT (mi), "setting-name", setting_name); - g_signal_connect (mi, "toggled", G_CALLBACK (preferences_toggled), settings); -} - -static void -show_menu_preferences (XtmProcessWindow *window) +monitor_update_step_size (XtmProcessWindow *window) { - static GtkWidget *menu = NULL; - GtkWidget *refresh_rate_menu; - GtkWidget *mi; - - if (menu != NULL) - { - gtk_widget_destroy (menu); - } - - menu = gtk_menu_new (); - menu_preferences_append_item (GTK_MENU (menu), _("Show all processes"), "show-all-processes", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("More precision"), "more-precision", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("Full command line"), "full-command-line", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("Show status icon"), "show-status-icon", window->priv->settings); - - refresh_rate_menu = build_refresh_rate_menu (window->priv->settings); - mi = gtk_menu_item_new_with_label (_("Refresh rate")); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), refresh_rate_menu); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); - - mi = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); - - menu_preferences_append_item (GTK_MENU (menu), _("PID"), "column-pid", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("PPID"), "column-ppid", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("State"), "column-state", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("Virtual Bytes"), "column-vsz", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("Private Bytes"), "column-rss", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("UID"), "column-uid", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("CPU"), "column-cpu", window->priv->settings); - menu_preferences_append_item (GTK_MENU (menu), _("Priority"), "column-priority", window->priv->settings); - - gtk_widget_show_all (menu); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ()); + guint refresh_rate; + g_object_get (window->settings, "refresh-rate", &refresh_rate, NULL); + g_object_set (window->cpu_monitor, "step-size", refresh_rate / 1000.0, NULL); + g_object_set (window->mem_monitor, "step-size", refresh_rate / 1000.0, NULL); } #if !GTK_CHECK_VERSION(2,18,0) @@ -432,7 +300,7 @@ #if !GTK_CHECK_VERSION(2,18,0) gtk_about_dialog_set_url_hook (url_hook_about_dialog, NULL, NULL); #endif - gtk_show_about_dialog (GTK_WINDOW (window->priv->window), + gtk_show_about_dialog (GTK_WINDOW (window->window), "program-name", _("Task Manager"), "version", PACKAGE_VERSION, "copyright", "Copyright \302\251 2005-2010 The Xfce development team", @@ -463,9 +331,9 @@ xtm_process_window_show (GtkWidget *widget) { g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (GTK_IS_WIDGET (XTM_PROCESS_WINDOW (widget)->priv->window)); - gtk_widget_show (XTM_PROCESS_WINDOW (widget)->priv->window); - gtk_window_present (GTK_WINDOW (XTM_PROCESS_WINDOW (widget)->priv->window)); + g_return_if_fail (GTK_IS_WIDGET (XTM_PROCESS_WINDOW (widget)->window)); + gtk_widget_show (XTM_PROCESS_WINDOW (widget)->window); + gtk_window_present (GTK_WINDOW (XTM_PROCESS_WINDOW (widget)->window)); GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE); } @@ -474,11 +342,11 @@ { gint winx, winy; g_return_if_fail (GTK_IS_WIDGET (widget)); - if (!GTK_IS_WIDGET (XTM_PROCESS_WINDOW (widget)->priv->window)) + if (!GTK_IS_WIDGET (XTM_PROCESS_WINDOW (widget)->window)) return; - gtk_window_get_position (GTK_WINDOW (XTM_PROCESS_WINDOW (widget)->priv->window), &winx, &winy); - gtk_widget_hide (XTM_PROCESS_WINDOW (widget)->priv->window); - gtk_window_move (GTK_WINDOW (XTM_PROCESS_WINDOW (widget)->priv->window), winx, winy); + gtk_window_get_position (GTK_WINDOW (XTM_PROCESS_WINDOW (widget)->window), &winx, &winy); + gtk_widget_hide (XTM_PROCESS_WINDOW (widget)->window); + gtk_window_move (GTK_WINDOW (XTM_PROCESS_WINDOW (widget)->window), winx, winy); GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE); } @@ -486,8 +354,8 @@ xtm_process_window_get_model (XtmProcessWindow *window) { g_return_val_if_fail (XTM_IS_PROCESS_WINDOW (window), NULL); - g_return_val_if_fail (GTK_IS_TREE_VIEW (window->priv->treeview), NULL); - return gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (window->priv->treeview)))); + g_return_val_if_fail (GTK_IS_TREE_VIEW (window->treeview), NULL); + return gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (window->treeview)))); } void @@ -497,26 +365,25 @@ gchar value[4]; g_return_if_fail (XTM_IS_PROCESS_WINDOW (window)); - g_return_if_fail (GTK_IS_STATUSBAR (window->priv->statusbar)); + g_return_if_fail (GTK_IS_STATUSBAR (window->statusbar)); - g_object_set (window->priv->statusbar, "num-processes", num_processes, "cpu", cpu, "memory", memory, "swap", swap, NULL); + g_object_set (window->statusbar, "num-processes", num_processes, "cpu", cpu, "memory", memory, "swap", swap, NULL); - xtm_process_monitor_add_peak (XTM_PROCESS_MONITOR (window->priv->cpu_monitor), cpu / 100.0); + xtm_process_monitor_add_peak (XTM_PROCESS_MONITOR (window->cpu_monitor), cpu / 100.0); g_snprintf (value, 4, "%.0f", cpu); g_snprintf (text, 100, _("CPU: %s%%"), value); - gtk_widget_set_tooltip_text (window->priv->cpu_monitor, text); + gtk_widget_set_tooltip_text (window->cpu_monitor, text); - xtm_process_monitor_add_peak (XTM_PROCESS_MONITOR (window->priv->mem_monitor), memory / 100.0); + xtm_process_monitor_add_peak (XTM_PROCESS_MONITOR (window->mem_monitor), memory / 100.0); g_snprintf (value, 4, "%.0f", memory); g_snprintf (text, 100, _("Memory: %s%%"), value); - gtk_widget_set_tooltip_text (window->priv->mem_monitor, text); + gtk_widget_set_tooltip_text (window->mem_monitor, text); } void xtm_process_window_show_swap_usage (XtmProcessWindow *window, gboolean show_swap_usage) { g_return_if_fail (XTM_IS_PROCESS_WINDOW (window)); - g_return_if_fail (GTK_IS_STATUSBAR (window->priv->statusbar)); - g_object_set (window->priv->statusbar, "show-swap", show_swap_usage, NULL); + g_return_if_fail (GTK_IS_STATUSBAR (window->statusbar)); + g_object_set (window->statusbar, "show-swap", show_swap_usage, NULL); } - diff -Nru xfce4-taskmanager-1.0.0/src/process-window.h xfce4-taskmanager-1.0.1/src/process-window.h --- xfce4-taskmanager-1.0.0/src/process-window.h 2010-06-08 20:41:38.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-window.h 2014-01-08 18:42:02.000000000 +0000 @@ -27,7 +27,7 @@ typedef struct _XtmProcessWindow XtmProcessWindow; GType xtm_process_window_get_type (void); -GtkWidget * xtm_process_window_new (); +GtkWidget * xtm_process_window_new (void); GtkTreeModel * xtm_process_window_get_model (XtmProcessWindow *window); void xtm_process_window_set_system_info (XtmProcessWindow *window, guint num_processes, gfloat cpu, gfloat memory, gfloat swap); void xtm_process_window_show_swap_usage (XtmProcessWindow *window, gboolean show_swap_usage); diff -Nru xfce4-taskmanager-1.0.0/src/process-window.ui xfce4-taskmanager-1.0.1/src/process-window.ui --- xfce4-taskmanager-1.0.0/src/process-window.ui 2010-06-13 14:17:29.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-window.ui 2014-01-08 18:42:02.000000000 +0000 @@ -14,34 +14,9 @@ True - both False 1 - - True - True - True - gtk-execute - - - False - True - - - - - True - True - True - gtk-preferences - - - False - True - - - True 2 @@ -75,19 +50,6 @@ False - True - - - - - True - True - True - gtk-quit - - - False - True @@ -136,7 +98,6 @@ True - 6 vertical 6 @@ -145,7 +106,6 @@ True automatic automatic - in diff -Nru xfce4-taskmanager-1.0.0/src/process-window_ui.h xfce4-taskmanager-1.0.1/src/process-window_ui.h --- xfce4-taskmanager-1.0.0/src/process-window_ui.h 2010-06-14 11:02:41.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/process-window_ui.h 2014-01-08 18:42:06.000000000 +0000 @@ -16,66 +16,47 @@ "ss-vbox\">TrueverticalTruebothFals" - "e1TrueTrueTrueg" - "tk-executeFalse<" - "/property>TrueTrueTrueTruegtk-preferencesFalseT" - "rueTrue2" - "TrueTrueTrue" - "2TrueTrueTrueTruegtk-aboutFalseTrueTrueTrueTruegtk-quitFalseTrueFalse0" - "verticalTru" - "eTrue63Warning, you are using the root account, you may har" - "m your system.FalseFalse" - "0True" - "False1FalseFalse1False1True2TrueTrueTrue6vertical6True<" - "property name=\"can_focus\">Trueautomaticautom" - "aticin02" + "h\">2TrueTrueTrueTruegtk-ab" + "outFalseFalse<" + "/property>0verticalTrueTrue63Warning, you are using the root account, you may harm your system.Fal" + "seFalse0TrueFalse1FalseFa" + "lse1Truevertical6TrueTrueautomaticautomatic" + "02<" + "placeholder/>" }; -static const unsigned process_window_ui_length = 4508u; +static const unsigned process_window_ui_length = 3252u; diff -Nru xfce4-taskmanager-1.0.0/src/settings-dialog.c xfce4-taskmanager-1.0.1/src/settings-dialog.c --- xfce4-taskmanager-1.0.0/src/settings-dialog.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings-dialog.c 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,183 @@ +/* + * Copyright (c) 2010 Mike Massonnet, + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "settings.h" +#include "settings-dialog.h" +#include "settings-dialog_ui.h" + + + +typedef struct _XtmSettingsDialogClass XtmSettingsDialogClass; +struct _XtmSettingsDialogClass +{ + GtkWidgetClass parent_class; +}; +struct _XtmSettingsDialog +{ + GtkWidget parent; + /**/ + GtkWidget * window; + XtmSettings * settings; +}; +G_DEFINE_TYPE (XtmSettingsDialog, xtm_settings_dialog, GTK_TYPE_WIDGET) + +static void xtm_settings_dialog_finalize (GObject *object); +static void xtm_settings_dialog_show (GtkWidget *widget); +static void xtm_settings_dialog_hide (GtkWidget *widget); + + + +static void +xtm_settings_dialog_class_init (XtmSettingsDialogClass *klass) +{ + GObjectClass *class; + GtkWidgetClass *widget_class; + xtm_settings_dialog_parent_class = g_type_class_peek_parent (klass); + class = G_OBJECT_CLASS (klass); + class->finalize = xtm_settings_dialog_finalize; + widget_class = GTK_WIDGET_CLASS (klass); + widget_class->show = xtm_settings_dialog_show; + widget_class->hide = xtm_settings_dialog_hide; +} + +static void +button_toggled (GtkToggleButton *button, XtmSettings *settings) +{ + gboolean active = gtk_toggle_button_get_active (button); + gchar *setting_name = g_object_get_data (G_OBJECT (button), "setting-name"); + g_object_set (settings, setting_name, active, NULL); +} + +static void +builder_bind_toggle_button (GtkBuilder *builder, gchar *widget_name, XtmSettings *settings, gchar *setting_name) +{ + gboolean active; + GtkWidget *button; + + g_object_get (settings, setting_name, &active, NULL); + + button = GTK_WIDGET (gtk_builder_get_object (builder, widget_name)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), active); + g_object_set_data (G_OBJECT (button), "setting-name", setting_name); + g_signal_connect (button, "toggled", G_CALLBACK (button_toggled), settings); +} + +static void +combobox_changed (GtkComboBox *combobox, XtmSettings *settings) +{ + guint active = gtk_combo_box_get_active (combobox); + gchar *setting_name = g_object_get_data (G_OBJECT (combobox), "setting-name"); + g_object_set (settings, setting_name, active, NULL); +} + +static void +xtm_settings_dialog_init (XtmSettingsDialog *dialog) +{ + GtkBuilder *builder; + + g_object_ref_sink (dialog); + + dialog->settings = xtm_settings_get_default (); + + builder = gtk_builder_new (); + gtk_builder_add_from_string (builder, settings_dialog_ui, settings_dialog_ui_length, NULL); + + dialog->window = GTK_WIDGET (gtk_builder_get_object (builder, "settings-dialog")); + +#ifndef HAVE_WNCK + gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "button-show-application-icons"))); +#endif + + builder_bind_toggle_button (builder, "button-show-application-icons", dialog->settings, "show-application-icons"); + builder_bind_toggle_button (builder, "button-full-command-line", dialog->settings, "full-command-line"); + builder_bind_toggle_button (builder, "button-more-precision", dialog->settings, "more-precision"); + builder_bind_toggle_button (builder, "button-monitor-paint-box", dialog->settings, "monitor-paint-box"); + builder_bind_toggle_button (builder, "button-prompt-terminate-task", dialog->settings, "prompt-terminate-task"); + builder_bind_toggle_button (builder, "button-show-status-icon", dialog->settings, "show-status-icon"); + + { + guint n; + GEnumClass *klass; + GtkWidget *box; + GtkWidget *combobox; + XtmToolbarStyle toolbar_style; + + box = GTK_WIDGET (gtk_builder_get_object (builder, "hbox-toolbar-style")); + combobox = gtk_combo_box_new_text (); + gtk_box_pack_start (GTK_BOX (box), combobox, FALSE, FALSE, 0); + gtk_widget_show (combobox); + + klass = g_type_class_ref (XTM_TYPE_TOOLBAR_STYLE); + for (n = 0; n < klass->n_values; ++n) + gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _(klass->values[n].value_nick)); + g_type_class_unref (klass); + + g_object_get (dialog->settings, "toolbar-style", &toolbar_style, NULL); + g_object_set_data (G_OBJECT (combobox), "setting-name", "toolbar-style"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), toolbar_style); + g_signal_connect (combobox, "changed", G_CALLBACK (combobox_changed), dialog->settings); + } + + g_object_unref (builder); +} + +static void +xtm_settings_dialog_finalize (GObject *object) +{ + XtmSettingsDialog *dialog = XTM_SETTINGS_DIALOG (object); + gtk_widget_destroy (dialog->window); + g_object_unref (dialog->settings); +} + + + +GtkWidget * +xtm_settings_dialog_new (GtkWindow *parent_window) +{ + GtkWidget *dialog = g_object_new (XTM_TYPE_SETTINGS_DIALOG, NULL); + gtk_window_set_transient_for (GTK_WINDOW (XTM_SETTINGS_DIALOG (dialog)->window), parent_window); + return dialog; +} + +static void +xtm_settings_dialog_show (GtkWidget *widget) +{ + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (GTK_IS_WIDGET (XTM_SETTINGS_DIALOG (widget)->window)); + gtk_widget_show (XTM_SETTINGS_DIALOG (widget)->window); + gtk_window_present (GTK_WINDOW (XTM_SETTINGS_DIALOG (widget)->window)); + GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE); +} + +static void +xtm_settings_dialog_hide (GtkWidget *widget) +{ + gint winx, winy; + g_return_if_fail (GTK_IS_WIDGET (widget)); + if (!GTK_IS_WIDGET (XTM_SETTINGS_DIALOG (widget)->window)) + return; + gtk_window_get_position (GTK_WINDOW (XTM_SETTINGS_DIALOG (widget)->window), &winx, &winy); + gtk_widget_hide (XTM_SETTINGS_DIALOG (widget)->window); + gtk_window_move (GTK_WINDOW (XTM_SETTINGS_DIALOG (widget)->window), winx, winy); + GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE); +} + +void +xtm_settings_dialog_run (XtmSettingsDialog *dialog) +{ + gtk_dialog_run (GTK_DIALOG (dialog->window)); +} diff -Nru xfce4-taskmanager-1.0.0/src/settings-dialog.h xfce4-taskmanager-1.0.1/src/settings-dialog.h --- xfce4-taskmanager-1.0.0/src/settings-dialog.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings-dialog.h 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2010 Mike Massonnet, + * + * 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. + */ + +#ifndef SETTINGS_DIALOG_H +#define SETTINGS_DIALOG_H + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#define XTM_TYPE_SETTINGS_DIALOG (xtm_settings_dialog_get_type ()) +#define XTM_SETTINGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XTM_TYPE_SETTINGS_DIALOG, XtmSettingsDialog)) +#define XTM_SETTINGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XTM_TYPE_SETTINGS_DIALOG, XtmSettingsDialogClass)) +#define XTM_IS_SETTINGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XTM_TYPE_SETTINGS_DIALOG)) +#define XTM_IS_SETTINGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XTM_TYPE_SETTINGS_DIALOG)) +#define XTM_SETTINGS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XTM_TYPE_SETTINGS_DIALOG, XtmSettingsDialogClass)) + +typedef struct _XtmSettingsDialog XtmSettingsDialog; + +GType xtm_settings_dialog_get_type (void); +GtkWidget * xtm_settings_dialog_new (GtkWindow *parent_window); +void xtm_settings_dialog_run (XtmSettingsDialog *dialog); + +#endif /* !SETTINGS_DIALOG_H */ diff -Nru xfce4-taskmanager-1.0.0/src/settings-dialog.ui xfce4-taskmanager-1.0.1/src/settings-dialog.ui --- xfce4-taskmanager-1.0.0/src/settings-dialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings-dialog.ui 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,390 @@ + + + + + + 5 + Settings for Task Manager + False + True + True + gtk-preferences + normal + False + + + True + vertical + 2 + + + True + True + False + + + True + 6 + + + True + vertical + 6 + + + True + 0 + none + + + True + 6 + 12 + + + True + vertical + 6 + + + Show application icons + True + True + False + True + + + 0 + + + + + Show full command lines + True + True + False + True + + + False + False + 1 + + + + + Show values with more precision + True + True + False + True + + + False + False + 2 + + + + + Draw borders around monitors + True + True + False + 0.49000000953674316 + True + + + False + False + 3 + + + + + True + 6 + + + True + Toolbar style: + + + False + False + 0 + + + + + + + + False + False + 4 + + + + + + + + + True + <b>Interface style</b> + True + + + + + False + False + 0 + + + + + True + 0 + none + + + True + 6 + 12 + + + True + vertical + 6 + + + Prompt for terminating tasks + True + True + False + True + + + False + False + 0 + + + + + Hide into the notification area + True + True + False + True + + + False + False + 1 + + + + + + + + + True + <b>Miscellaneous</b> + True + + + + + False + False + 1 + + + + + 0 + + + + + vertical + + + False + 6 + 1 + + + + + vertical + 6 + + + True + False + 0 + none + + + True + 6 + 12 + + + True + vertical + 6 + + + True + 6 + + + True + Refresh rate: + + + False + False + 0 + + + + + True + + + False + False + 1 + + + + + False + False + 0 + + + + + True + 0 + Columns: + + + False + False + 1 + + + + + True + 12 + + + True + True + never + never + in + + + True + True + + + + + + + 2 + + + + + + + + + True + <b>Information</b> + True + + + + + 0 + + + + + 2 + + + + + + + True + Settings + + + False + + + + + + + + + + + + + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + button-close + + + diff -Nru xfce4-taskmanager-1.0.0/src/settings-dialog_ui.h xfce4-taskmanager-1.0.1/src/settings-dialog_ui.h --- xfce4-taskmanager-1.0.0/src/settings-dialog_ui.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings-dialog_ui.h 2014-01-08 18:42:06.000000000 +0000 @@ -0,0 +1,180 @@ +/* automatically generated from settings-dialog.ui */ +#ifdef __SUNPRO_C +#pragma align 4 (settings_dialog_ui) +#endif +#ifdef __GNUC__ +static const char settings_dialog_ui[] __attribute__ ((__aligned__ (4))) = +#else +static const char settings_dialog_ui[] = +#endif +{ + "5Settings for Task ManagerFalseTru" + "eTruegtk-preferencesnormalFalseTruevertical2TrueTrueFalseTrue6Truevertical6True0noneTrue612Truevertical6<" + "object class=\"GtkCheckButton\" id=\"button-show-application-icons\">Show application iconsTrueTrueFalseTrue0Show full command linesTrueTrue<" + "/property>FalseTrueFalseFalse1Show values with more precision" + "True" + "TrueFalseTrueFalseFalse2Draw borders around monitorsTrueTrueFalse0.49000000953674316TrueFalseFalse3True<" + "/property>6TrueToolbar style:FalseFalse0FalseFals" + "e4<" + "/object>True<b>Interface s" + "tyle</b>True<" + "/object>FalseFalse0True0noneTrue612True" + "vertical6Pr" + "ompt for terminating tasksTrueTrueFalseTrue" + "False" + "False0Hide into the notification areaT" + "rueTrueFalseTrueFalseFalse1True<b>Miscellaneous</b>TrueFalseFalse10vertical" + "False61vertical6TrueFalse0" + "noneTrue612Truevertical6True6TrueRefresh rate:FalseFalse" + "0TrueFal" + "seFalse1FalseFalse0True" + "0Columns:FalseFalse1True12TrueTr" + "ueneverneverinTrueTrue2True<b>Information<" + ";/b>True02TrueSettingsFalse1Trueendgtk-closeTrueTrueTrueTrueFalseFalse0Falseend0butt" + "on-close" +}; + +static const unsigned settings_dialog_ui_length = 11244u; + diff -Nru xfce4-taskmanager-1.0.0/src/settings-tool-button.c xfce4-taskmanager-1.0.1/src/settings-tool-button.c --- xfce4-taskmanager-1.0.0/src/settings-tool-button.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings-tool-button.c 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 2010 Mike Massonnet, + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "settings-tool-button.h" +#include "settings-dialog.h" +#include "settings.h" + + + +typedef struct _XtmSettingsToolButtonClass XtmSettingsToolButtonClass; +struct _XtmSettingsToolButtonClass +{ + GtkMenuToolButtonClass parent_class; +}; +struct _XtmSettingsToolButton +{ + GtkMenuToolButton parent; + /**/ +}; +G_DEFINE_TYPE (XtmSettingsToolButton, xtm_settings_tool_button, GTK_TYPE_MENU_TOOL_BUTTON) + +static GtkWidget * construct_menu (void); +static void show_settings_dialog (XtmSettingsToolButton *button); + + + +static void +xtm_settings_tool_button_class_init (XtmSettingsToolButtonClass *klass) +{ + xtm_settings_tool_button_parent_class = g_type_class_peek_parent (klass); +} + +static void +xtm_settings_tool_button_init (XtmSettingsToolButton *button) +{ + GtkWidget *menu; + + gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (button), "gtk-preferences"); + gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (button), TRUE); + + menu = construct_menu (); + gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (button), menu); + g_signal_connect (button, "clicked", G_CALLBACK (show_settings_dialog), NULL); + + gtk_widget_show_all (GTK_WIDGET (button)); +} + + + +static void +show_settings_dialog (XtmSettingsToolButton *button) +{ + GtkWidget *parent_window = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW); + GtkWidget *dialog = xtm_settings_dialog_new (GTK_WINDOW (parent_window)); + xtm_settings_dialog_run (XTM_SETTINGS_DIALOG (dialog)); + g_object_unref (dialog); +} + +static void +refresh_rate_toggled (GtkCheckMenuItem *mi, XtmSettings *settings) +{ + guint refresh_rate = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (mi), "refresh-rate")); + g_object_set (settings, "refresh-rate", refresh_rate, NULL); +} + +static void +menu_refresh_rate_append_item (GtkMenu *menu, gchar *title, guint refresh_rate, XtmSettings *settings) +{ + GtkWidget *mi; + guint cur_refresh_rate; + + g_object_get (settings, "refresh-rate", &cur_refresh_rate, NULL); + + if (cur_refresh_rate == refresh_rate) + { + mi = gtk_radio_menu_item_new_with_label (NULL, title); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), TRUE); + } + else + { + mi = gtk_menu_item_new_with_label (title); + } + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + g_object_set_data (G_OBJECT (mi), "refresh-rate", GUINT_TO_POINTER (refresh_rate)); + g_signal_connect (mi, "activate", G_CALLBACK (refresh_rate_toggled), settings); +} + +static GtkWidget * +build_refresh_rate_menu (XtmSettings *settings) +{ + GtkWidget *menu; + + menu = gtk_menu_new (); + + /* TRANSLATORS: The next values are in seconds or milliseconds */ + menu_refresh_rate_append_item (GTK_MENU (menu), _("500ms"), 500, settings); + menu_refresh_rate_append_item (GTK_MENU (menu), _("750ms"), 750, settings); + menu_refresh_rate_append_item (GTK_MENU (menu), _("1s"), 1000, settings); + menu_refresh_rate_append_item (GTK_MENU (menu), _("2s"), 2000, settings); + menu_refresh_rate_append_item (GTK_MENU (menu), _("5s"), 5000, settings); + menu_refresh_rate_append_item (GTK_MENU (menu), _("10s"), 10000, settings); + + return menu; +} + +static void +item_toggled (GtkCheckMenuItem *mi, XtmSettings *settings) +{ + gboolean active = gtk_check_menu_item_get_active (mi); + gchar *setting_name = g_object_get_data (G_OBJECT (mi), "setting-name"); + g_object_set (settings, setting_name, active, NULL); +} + +static void +settings_notify (GObject *object, GParamSpec *pspec, GtkCheckMenuItem *mi) +{ + gboolean active; + g_object_get (object, pspec->name, &active, NULL); + gtk_check_menu_item_set_active (mi, active); +} + +static void +menu_append_item (GtkMenu *menu, gchar *title, gchar *setting_name, XtmSettings *settings) +{ + GtkWidget *mi; + gboolean active = FALSE; + gchar *notify_name; + + g_object_get (settings, setting_name, &active, NULL); + + mi = gtk_check_menu_item_new_with_label (title); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), active); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + g_object_set_data (G_OBJECT (mi), "setting-name", setting_name); + g_signal_connect (mi, "toggled", G_CALLBACK (item_toggled), settings); + + notify_name = g_strdup_printf ("notify::%s", setting_name); + g_signal_connect (settings, notify_name, G_CALLBACK (settings_notify), mi); + g_free (notify_name); +} + +static inline GtkWidget * +construct_menu (void) +{ + XtmSettings *settings = xtm_settings_get_default (); + GtkWidget *menu = gtk_menu_new (); + GtkWidget *refresh_rate_menu; + GtkWidget *mi; + + menu_append_item (GTK_MENU (menu), _("Show all processes"), "show-all-processes", settings); + + refresh_rate_menu = build_refresh_rate_menu (settings); + mi = gtk_menu_item_new_with_label (_("Refresh rate")); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), refresh_rate_menu); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + + mi = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + + menu_append_item (GTK_MENU (menu), _("PID"), "column-pid", settings); + menu_append_item (GTK_MENU (menu), _("PPID"), "column-ppid", settings); + menu_append_item (GTK_MENU (menu), _("State"), "column-state", settings); + menu_append_item (GTK_MENU (menu), _("Virtual Bytes"), "column-vsz", settings); + menu_append_item (GTK_MENU (menu), _("Private Bytes"), "column-rss", settings); + menu_append_item (GTK_MENU (menu), _("UID"), "column-uid", settings); + menu_append_item (GTK_MENU (menu), _("CPU"), "column-cpu", settings); + menu_append_item (GTK_MENU (menu), _("Priority"), "column-priority", settings); + + gtk_widget_show_all (menu); + + return menu; +} + + + +GtkWidget * +xtm_settings_tool_button_new (void) +{ + return g_object_new (XTM_TYPE_SETTINGS_TOOL_BUTTON, NULL); +} + diff -Nru xfce4-taskmanager-1.0.0/src/settings-tool-button.h xfce4-taskmanager-1.0.1/src/settings-tool-button.h --- xfce4-taskmanager-1.0.0/src/settings-tool-button.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings-tool-button.h 2014-01-08 18:42:02.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2010 Mike Massonnet, + * + * 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. + */ + +#ifndef SETTINGS_TOOL_BUTTON_H +#define SETTINGS_TOOL_BUTTON_H + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#define XTM_TYPE_SETTINGS_TOOL_BUTTON (xtm_settings_tool_button_get_type ()) +#define XTM_SETTINGS_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XTM_TYPE_SETTINGS_TOOL_BUTTON, XtmSettingsToolButton)) +#define XTM_SETTINGS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XTM_TYPE_SETTINGS_TOOL_BUTTON, XtmSettingsToolButtonClass)) +#define XTM_IS_SETTINGS_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XTM_TYPE_SETTINGS_TOOL_BUTTON)) +#define XTM_IS_SETTINGS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XTM_TYPE_SETTINGS_TOOL_BUTTON)) +#define XTM_SETTINGS_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XTM_TYPE_SETTINGS_TOOL_BUTTON, XtmSettingsToolButtonClass)) + +typedef struct _XtmSettingsToolButton XtmSettingsToolButton; + +GType xtm_settings_tool_button_get_type (void); +GtkWidget * xtm_settings_tool_button_new (void); + +#endif /* !SETTINGS_TOOL_BUTTON_H */ diff -Nru xfce4-taskmanager-1.0.0/src/settings.c xfce4-taskmanager-1.0.1/src/settings.c --- xfce4-taskmanager-1.0.0/src/settings.c 2010-06-01 23:02:40.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings.c 2014-01-08 18:42:02.000000000 +0000 @@ -24,6 +24,7 @@ #include #include +#include #include "settings.h" @@ -35,6 +36,10 @@ PROP_MORE_PRECISION, PROP_FULL_COMMAND_LINE, PROP_SHOW_STATUS_ICON, + PROP_MONITOR_PAINT_BOX, + PROP_SHOW_APPLICATION_ICONS, + PROP_TOOLBAR_STYLE, + PROP_PROMPT_TERMINATE_TASK, PROP_REFRESH_RATE, PROP_COLUMNS_POSITIONS, PROP_COLUMN_UID, @@ -88,6 +93,14 @@ g_param_spec_boolean ("full-command-line", "FullCommandLine", "Full command line", FALSE, G_PARAM_READWRITE)); g_object_class_install_property (class, PROP_SHOW_STATUS_ICON, g_param_spec_boolean ("show-status-icon", "ShowStatusIcon", "Show/hide the status icon", TRUE, G_PARAM_READWRITE)); + g_object_class_install_property (class, PROP_MONITOR_PAINT_BOX, + g_param_spec_boolean ("monitor-paint-box", "MonitorPaintBox", "Paint box around monitor", TRUE, G_PARAM_READWRITE)); + g_object_class_install_property (class, PROP_SHOW_APPLICATION_ICONS, + g_param_spec_boolean ("show-application-icons", "ShowApplicationIcons", "Show application icons", TRUE, G_PARAM_READWRITE)); + g_object_class_install_property (class, PROP_TOOLBAR_STYLE, + g_param_spec_enum ("toolbar-style", "ToolbarStyle", "Toolbar style", XTM_TYPE_TOOLBAR_STYLE, XTM_TOOLBAR_STYLE_DEFAULT, G_PARAM_READWRITE)); + g_object_class_install_property (class, PROP_PROMPT_TERMINATE_TASK, + g_param_spec_boolean ("prompt-terminate-task", "PromptTerminateTask", "Prompt dialog for terminating a task", TRUE, G_PARAM_READWRITE)); g_object_class_install_property (class, PROP_REFRESH_RATE, g_param_spec_uint ("refresh-rate", "RefreshRate", "Refresh rate in milliseconds", 0, G_MAXUINT, 750, G_PARAM_READWRITE)); g_object_class_install_property (class, PROP_COLUMNS_POSITIONS, @@ -171,6 +184,25 @@ } static void +transform_string_to_enum (const GValue *src, GValue *dst) +{ + GEnumClass *klass; + gint value = 0; + guint n; + + klass = g_type_class_ref (G_VALUE_TYPE (dst)); + for (n = 0; n < klass->n_values; ++n) + { + value = klass->values[n].value; + if (!g_ascii_strcasecmp (klass->values[n].value_name, g_value_get_string (src))) + break; + } + g_type_class_unref (klass); + + g_value_set_enum (dst, value); +} + +static void register_transformable (void) { if (!g_value_type_transformable (G_TYPE_STRING, G_TYPE_BOOLEAN)) @@ -181,6 +213,8 @@ if (!g_value_type_transformable (G_TYPE_STRING, G_TYPE_UINT)) g_value_register_transform_func (G_TYPE_STRING, G_TYPE_UINT, transform_string_to_uint); + + g_value_register_transform_func (G_TYPE_STRING, G_TYPE_ENUM, transform_string_to_enum); } static void @@ -333,3 +367,24 @@ return settings; } + + +GType +xtm_toolbar_style_get_type (void) +{ + static GType type = G_TYPE_INVALID; + + static const GEnumValue values[] = { + { XTM_TOOLBAR_STYLE_DEFAULT, "DEFAULT", N_("Default") }, + { XTM_TOOLBAR_STYLE_SMALL, "SMALL", N_("Small") }, + { XTM_TOOLBAR_STYLE_LARGE, "LARGE", N_("Large") }, + { XTM_TOOLBAR_STYLE_TEXT, "TEXT", N_("Text") }, + { 0, NULL, NULL } + }; + + if (type != G_TYPE_INVALID) + return type; + + type = g_enum_register_static ("XtmToolbarStyle", values); + return type; +} diff -Nru xfce4-taskmanager-1.0.0/src/settings.h xfce4-taskmanager-1.0.1/src/settings.h --- xfce4-taskmanager-1.0.0/src/settings.h 2010-05-01 10:32:39.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/settings.h 2014-01-08 18:42:02.000000000 +0000 @@ -26,6 +26,19 @@ typedef struct _XtmSettings XtmSettings; GType xtm_settings_get_type (void); -XtmSettings * xtm_settings_get_default (); +XtmSettings * xtm_settings_get_default (void); + + + +typedef enum +{ + XTM_TOOLBAR_STYLE_DEFAULT, + XTM_TOOLBAR_STYLE_SMALL, + XTM_TOOLBAR_STYLE_LARGE, + XTM_TOOLBAR_STYLE_TEXT, +} XtmToolbarStyle; + +GType xtm_toolbar_style_get_type (void); +#define XTM_TYPE_TOOLBAR_STYLE (xtm_toolbar_style_get_type ()) #endif /* !SETTINGS_H */ diff -Nru xfce4-taskmanager-1.0.0/src/task-manager-bsd.c xfce4-taskmanager-1.0.1/src/task-manager-bsd.c --- xfce4-taskmanager-1.0.0/src/task-manager-bsd.c 2010-05-21 11:37:20.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/task-manager-bsd.c 2014-01-08 18:42:02.000000000 +0000 @@ -41,7 +41,11 @@ { int mib[6]; size_t size; +#ifdef __OpenBSD__ + struct kinfo_proc *kp; +#else struct kinfo_proc2 *kp; +#endif Task t; struct passwd *passwdp; char **args, **ptr; @@ -49,23 +53,48 @@ int nproc, i; mib[0] = CTL_KERN; +#ifdef __OpenBSD__ + mib[1] = KERN_PROC; +#else mib[1] = KERN_PROC2; +#endif mib[2] = KERN_PROC_ALL; mib[3] = 0; +#ifdef __OpenBSD__ + mib[4] = sizeof(struct kinfo_proc); +#else mib[4] = sizeof(struct kinfo_proc2); +#endif mib[5] = 0; if (sysctl(mib, 6, NULL, &size, NULL, 0) < 0) +#ifdef __OpenBSD__ + errx(1, "could not get kern.proc size"); +#else errx(1, "could not get kern.proc2 size"); +#endif size = 5 * size / 4; /* extra slop */ if ((kp = malloc(size)) == NULL) errx(1,"failed to allocate memory for proc structures"); +#ifdef __OpenBSD__ + mib[5] = (int)(size / sizeof(struct kinfo_proc)); +#else mib[5] = (int)(size / sizeof(struct kinfo_proc2)); +#endif if (sysctl(mib, 6, kp, &size, NULL, 0) < 0) +#ifdef __OpenBSD__ + errx(1, "could not read kern.proc"); + nproc = (int)(size / sizeof(struct kinfo_proc)); +#else errx(1, "could not read kern.proc2"); nproc = (int)(size / sizeof(struct kinfo_proc2)); +#endif for (i=0 ; i < nproc ; i++) { +#ifdef __OpenBSD__ + struct kinfo_proc p = kp[i]; +#else struct kinfo_proc2 p = kp[i]; +#endif t.pid = p.p_pid; t.ppid = p.p_ppid; t.uid = p.p_uid; @@ -117,17 +146,34 @@ pid_is_sleeping (guint pid) { int mib[6]; +#ifdef __OpenBSD__ + struct kinfo_proc kp; + size_t size = sizeof(struct kinfo_proc); +#else struct kinfo_proc2 kp; size_t size = sizeof(struct kinfo_proc2); +#endif mib[0] = CTL_KERN; +#ifdef __OpenBSD__ + mib[1] = KERN_PROC; +#else mib[1] = KERN_PROC2; +#endif mib[2] = KERN_PROC_PID; mib[3] = pid; +#ifdef __OpenBSD__ + mib[4] = sizeof(struct kinfo_proc); +#else mib[4] = sizeof(struct kinfo_proc2); +#endif mib[5] = 1; if (sysctl(mib, 6, &kp, &size, NULL, 0) < 0) +#ifdef __OpenBSD__ + errx(1, "could not read kern.proc for pid %d", pid); +#else errx(1, "could not read kern.proc2 for pid %d", pid); +#endif return (kp.p_stat == SSLEEP ? TRUE : FALSE); } diff -Nru xfce4-taskmanager-1.0.0/src/task-manager.c xfce4-taskmanager-1.0.1/src/task-manager.c --- xfce4-taskmanager-1.0.0/src/task-manager.c 2010-06-08 20:41:38.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/task-manager.c 2014-01-08 18:42:02.000000000 +0000 @@ -83,7 +83,7 @@ static void model_mark_tree_iter_as_removed (GtkTreeModel *model, GtkTreeIter *iter); static void model_remove_tree_iter (GtkTreeModel *model, GtkTreeIter *iter); static void model_find_tree_iter_for_pid (GtkTreeModel *model, guint pid, GtkTreeIter *iter); -static glong __current_timestamp (); +static glong __current_timestamp (void); diff -Nru xfce4-taskmanager-1.0.0/src/task-manager.h xfce4-taskmanager-1.0.1/src/task-manager.h --- xfce4-taskmanager-1.0.0/src/task-manager.h 2010-06-09 11:50:23.000000000 +0000 +++ xfce4-taskmanager-1.0.1/src/task-manager.h 2014-01-08 18:42:02.000000000 +0000 @@ -91,7 +91,7 @@ }; void get_owner_uid (guint *owner_uid, gchar **owner_uid_name); -gchar * get_hostname (); +gchar * get_hostname (void); gboolean send_signal_to_pid (guint pid, gint xtm_signal); gboolean set_priority_to_pid (guint pid, gint priority);