Hello community, here is the log from the commit of package pk-update-icon for openSUSE:Factory checked in at 2015-06-23 12:00:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pk-update-icon (Old) and /work/SRC/openSUSE:Factory/.pk-update-icon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pk-update-icon" Changes: -------- --- /work/SRC/openSUSE:Factory/pk-update-icon/pk-update-icon.changes 2014-02-08 10:34:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pk-update-icon.new/pk-update-icon.changes 2015-06-23 12:00:53.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Jun 22 18:43:32 UTC 2015 - [email protected] + +- update to version 2 + - Update German and Indonesian translations + - Update and improve Czech translation + - Avoid passing more arguments to g_strdup_printf() than specified in the + format + - Document configuration default values + - Make the update viewer command configurable + - Prevent calling g_source_remove() on an invalid source ID + - Improve README file + - Add NEWS file + +------------------------------------------------------------------- Old: ---- pk-update-icon-1.tar.gz New: ---- pk-update-icon-2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pk-update-icon.spec ++++++ --- /var/tmp/diff_new_pack.VaJdqo/_old 2015-06-23 12:00:53.000000000 +0200 +++ /var/tmp/diff_new_pack.VaJdqo/_new 2015-06-23 12:00:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pk-update-icon # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: pk-update-icon -Version: 1 +Version: 2 Release: 0 Summary: Software Update Notifier based on PackageKit License: GPL-2.0+ @@ -52,7 +52,8 @@ %if 0%{?suse_version} == 1230 DOCBOOK5_MANPAGES_STYLESHEET='/usr/share/xml/docbook/stylesheet/nwalsh5/1.77.1/manpages/docbook.xsl' \ %endif - CFLAGS="%{optflags}" + CFLAGS="%{optflags}" \ + UPDATE_VIEWER_COMMAND="/usr/bin/gpk-update-viewer" %install %make_install prefix=%{_prefix} @@ -65,7 +66,7 @@ %files %defattr(-,root,root) -%doc README COPYING +%doc README COPYING NEWS %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_sysconfdir}/xdg/autostart/%{name}.desktop ++++++ pk-update-icon-1.tar.gz -> pk-update-icon-2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/Makefile new/pk-update-icon-2/Makefile --- old/pk-update-icon-1/Makefile 2014-02-07 21:58:22.000000000 +0100 +++ new/pk-update-icon-2/Makefile 2015-06-19 15:51:00.000000000 +0200 @@ -20,7 +20,7 @@ PACKAGE = pk-update-icon APP_NAME = org.opensuse.pk-update-icon -VERSION = 1 +VERSION = 2 DISTNAME := $(PACKAGE)-$(VERSION) # gcc, clang, icc @@ -40,6 +40,7 @@ INTLTOOL_MERGE := intltool-merge XSLTPROC := xsltproc DOCBOOK5_MANPAGES_STYLESHEET = http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl +UPDATE_VIEWER_COMMAND = /usr/bin/gpk-update-viewer define generate-manpage-rule = %.$(1): %.$(1).xml @@ -75,7 +76,8 @@ -DPACKAGE="\"$(PACKAGE)\"" \ -DAPP_NAME=\"$(APP_NAME)\" \ -DVERSION=\"$(VERSION)\" \ - -DLOCALEDIR="\"$(localedir)\"" + -DLOCALEDIR="\"$(localedir)\"" \ + -DUPDATE_VIEWER_COMMAND="\"$(UPDATE_VIEWER_COMMAND)\"" LDLIBS := $(shell pkg-config --libs gtk+-2.0 unique-1.0 libnotify packagekit-glib2) DOCBOOK5_MANPAGES_FLAGS = --stringparam man.authors.section.enabled 0 \ --stringparam man.copyright.section.enabled 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/NEWS new/pk-update-icon-2/NEWS --- old/pk-update-icon-1/NEWS 1970-01-01 01:00:00.000000000 +0100 +++ new/pk-update-icon-2/NEWS 2015-06-19 15:53:26.000000000 +0200 @@ -0,0 +1,64 @@ +News +==== + +pk-update-icon 2 (2015-06-19T13:08:33+02:00) +-------------------------------------------- + +- Update German and Indonesian translations +- Update and improve Czech translation +- Avoid passing more arguments to g_strdup_printf() than specified in the format +- Document configuration default values +- Make the update viewer command configurable +- Prevent calling g_source_remove() on an invalid source ID +- Improve README file +- Add NEWS file + +pk-update-icon 1 (2014-02-07T22:05:17+01:00) +-------------------------------------------- + +- Add missing function prototypes +- Stylistic fixes +- Add README file with build instructions and author information +- Convert the manpage to DocBook V5.0 +- Use pax to generate tarballs +- Fix automatic dependency generation and improve portability + +pk-update-icon 0.2.2 (2012-07-18T11:54:03+02:00) +------------------------------------------------ + +- increase the default update interval and delay before checking for updates + +pk-update-icon 0.2.1 (2011-11-15T13:03:17+01:00) +------------------------------------------------ + +- hide the autostart file in KDE and GNOME rather than explicitly showing it in Xfce and LXDE only +- increase default startup-delay to 5 min (bnc#729230) +- fix some typos +- use the VERSION macro in the about dialog + +pk-update-icon 0.2 (2011-10-22T10:20:02+02:00) +---------------------------------------------- + +- add dist target to Makefile +- add french translation +- added slovak and czech translations +- added a button for installing updates to the notification +- add an about dialog +- added Indonesian translations +- add CLI, make delay and interval configurable +- add clobber target +- GObject-based rewrite +- fix the locale path +- add license header to main.h +- add compatibility with libnotify version < 0.7 +- add a man page +- use libunique to ensure that only a single instance of pk-update-icon can be run +- add internationalization support +- allow overriding CFLAGS +- fix desktop file and arguments order in Makefile +- use libnotify's pkgconfig for buildflags +- use GTK2 as Xfce/LXDE are not yet using GTK3 +- code rework, show notify window just once +- added GPLv2 headers +- change icon and tooltip of the tray icon +- initial commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/README new/pk-update-icon-2/README --- old/pk-update-icon-1/README 2014-02-07 18:30:00.000000000 +0100 +++ new/pk-update-icon-2/README 2015-06-19 13:04:57.000000000 +0200 @@ -10,20 +10,75 @@ Build Instructions ------------------ -pk-update-icon requires GNU make, GNU gettext, GNU or BSD install, the -xsltproc tool from libxml2 and the following shared libraries to be installed: +pk-update-icon requires a POSIX:2004 compatible operating system, it has been +tested to work on Linux distributions. The following tools and shared +libraries are required to build pk-update-icon: +- GNU make >= 3.81 +- pkg-config +- GNU gettext +- GNU or BSD install - GLib version 2.30 or later - GTK+ version 2.24 or later - libunique - libnotify - PackageKit-glib2 -Authors +Rebuilding the man pages additionally requires the xsltproc tool from libxml2. + +Before building pk-update-icon check the commented macros in the Makefile for +any macros you may need to override depending on the used toolchain and +operating system. + +By default, all files will be installed under the "/usr/local" directory, a +different installation path prefix can be set via the `prefix` macro. In +addition, a second path prefix can be specified via the `DESTDIR` macro which +will be prepended to any path, incuding the `prefix` macro path prefix. In +contrast to `prefix`, the path specified via the `DESTDIR` macro will only be +prepended to paths during installation and not be used for constructing +internal paths. + +The following instructions assume that `make` is GNU make, on some platforms +it may be installed under a different name or a non-default path. In order to +start the build process run `make all`. After a successful build, run `make +install` to install the program, any associated data files and the +documentation. + +Previously built binaries, object files, generated data files and +documentation can be removed by running `make clean`, any additional, +generated files which are not removed by the `clean` target can be removed by +running `make clobber`. + +Contact ------- -pk-update-icon was initially created by Pavol Rusnak and later rewritten by -Guido Berhoerster. +Please send any feedback, translations or bug reports via email to +<[email protected]>. + +Bug Reports +----------- + +When sending bug reports, please always mention the exact version of +pk-update-icon with which the issue occurs as well as the version of the +operating system you are using and make sure that you provide sufficient +information to reproduce the issue and include any input, output, any error +messages. + +In case of build issues, please also specify the implementations and versions +of the tools and shared libraries used to build the program, in particular the +compiler. + +In case of crashes, please generate a stack trace with a suitable debugger +such as gdb, lldb, dbx, or debug after a crash has occurred either by +examining the resulting core file or by running the program from the debugger +and attach it to the bug report. In order to generate a meaningful stack +trace the program as well as any dynamically linked libraries need to be built +with debugging information, see the documentation of the used compiler for the +required compiler flags. If any of the dynamically linked shared libraries do +not contain debugging information, please either install debugging information +for these libraries using mechanisms provided by your operating system or +rebuild the libraries accordingly. Please refer to the documentation of the +debugger for detailed instructions on generating backtraces. License ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/main.c new/pk-update-icon-2/main.c --- old/pk-update-icon-1/main.c 2014-02-07 17:47:49.000000000 +0100 +++ new/pk-update-icon-2/main.c 2015-06-19 13:08:04.000000000 +0200 @@ -32,11 +32,15 @@ UniqueApp *app = NULL; int exitval = 0; gboolean version = FALSE; + gchar *update_viewer_command = NULL; gint startup_delay = 300; gint check_interval = 86400; GOptionContext *context; GError *error = NULL; const GOptionEntry options[] = { + { "command", 'c', 0, G_OPTION_ARG_STRING, + &update_viewer_command, N_("Command for starting the " + "software update viewer"), "command" }, { "delay", 'd', 0, G_OPTION_ARG_INT, &startup_delay, N_("Set the delay in seconds before the first check for " "updates"), "delay" }, @@ -98,7 +102,8 @@ notify_init(PACKAGE); - icon = pkui_icon_new(startup_delay, check_interval); + icon = pkui_icon_new(startup_delay, check_interval, + update_viewer_command); gtk_main(); @@ -108,6 +113,7 @@ g_object_unref(app); if (notify_is_initted()) notify_uninit (); + g_free(update_viewer_command); return (exitval); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/pk-update-icon.1.xml new/pk-update-icon-2/pk-update-icon.1.xml --- old/pk-update-icon-1/pk-update-icon.1.xml 2014-02-07 18:10:41.000000000 +0100 +++ new/pk-update-icon-2/pk-update-icon.1.xml 2015-06-19 13:08:28.000000000 +0200 @@ -30,7 +30,7 @@ <email>[email protected]</email> <personblurb/> </author> - <date>7 February, 2014</date> + <date>18 Juni, 2015</date> </info> <refmeta> <refentrytitle>pk-update-icon</refentrytitle> @@ -67,6 +67,16 @@ </group> <group> <arg choice="plain"> + <option>-c</option> + <replaceable>command</replaceable> + </arg> + <arg choice="plain"> + <option>--command</option> + <replaceable>command</replaceable> + </arg> + </group> + <group> + <arg choice="plain"> <option>-d</option> <replaceable>delay</replaceable> </arg> @@ -99,6 +109,20 @@ <variablelist> <varlistentry> <term> + <option>-c</option> + <replaceable>command</replaceable> + </term> + <term> + <option>--command</option> + <replaceable>command</replaceable> + </term> + <listitem> + <para>Specify the command for starting the software update + viewer.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> <option>-d</option> <replaceable>delay</replaceable> </term> @@ -108,7 +132,7 @@ </term> <listitem> <para>Set the delay in seconds before the first check for - updates.</para> + updates. The default is five minutes.</para> </listitem> </varlistentry> <varlistentry> @@ -135,7 +159,8 @@ <replaceable>interval</replaceable> </term> <listitem> - <para>Set the interval in seconds between checks for updates.</para> + <para>Set the interval in seconds between checks for updates. + The default is one day.</para> </listitem> </varlistentry> <varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/pkui-backend.c new/pk-update-icon-2/pkui-backend.c --- old/pk-update-icon-1/pkui-backend.c 2014-02-07 21:49:35.000000000 +0100 +++ new/pk-update-icon-2/pkui-backend.c 2015-06-19 13:07:57.000000000 +0200 @@ -75,7 +75,9 @@ case PROP_STARTUP_DELAY: self->priv->startup_delay = g_value_get_uint(value); - g_source_remove(self->priv->periodic_check_id); + if (self->priv->periodic_check_id != 0) { + g_source_remove(self->priv->periodic_check_id); + } self->priv->periodic_check_id = g_timeout_add_seconds(self->priv->startup_delay, (GSourceFunc)periodic_check, self); @@ -94,7 +96,9 @@ if (time_to_check <= 0) pkui_backend_check_now(self); else { - g_source_remove(self->priv->periodic_check_id); + if (self->priv->periodic_check_id != 0) { + g_source_remove(self->priv->periodic_check_id); + } self->priv->periodic_check_id = g_timeout_add_seconds(time_to_check, periodic_check, self); @@ -238,6 +242,7 @@ pkui_backend_check_now(self); /* rescheduling happens after results are available */ + self->priv->periodic_check_id = 0; return (FALSE); } @@ -310,8 +315,9 @@ self->priv->last_check = g_get_real_time(); if (!self->priv->inhibit_check) { - if (self->priv->periodic_check_id != 0) + if (self->priv->periodic_check_id != 0) { g_source_remove(self->priv->periodic_check_id); + } self->priv->periodic_check_id = g_timeout_add_seconds(self->priv->check_interval, (GSourceFunc)periodic_check, self); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/pkui-icon.c new/pk-update-icon-2/pkui-icon.c --- old/pk-update-icon-1/pkui-icon.c 2014-02-07 21:55:01.000000000 +0100 +++ new/pk-update-icon-2/pkui-icon.c 2015-06-19 13:08:30.000000000 +0200 @@ -25,7 +25,9 @@ G_DEFINE_TYPE(PkuiIcon, pkui_icon, G_TYPE_OBJECT) -#define UPDATE_VIEWER_COMMAND "/usr/bin/gpk-update-viewer" +#ifndef UPDATE_VIEWER_COMMAND +#define UPDATE_VIEWER_COMMAND "" +#endif /* UPDATE_VIEWER_COMMAND */ #define PKUI_ICON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ PKUI_TYPE_ICON, PkuiIconPrivate)) @@ -37,6 +39,7 @@ GtkStatusIcon *status_icon; GtkWidget *status_icon_popup_menu; NotifyNotification *notification; + gchar *update_viewer_command; }; static GtkWidget* icon_popup_menu_create(PkuiIcon *self); @@ -60,6 +63,7 @@ g_object_unref(self->priv->notification); } g_object_unref(self->priv->backend); + g_free(self->priv->update_viewer_command); G_OBJECT_CLASS(pkui_icon_parent_class)->finalize(gobject); } @@ -97,23 +101,34 @@ self->priv->notification = NULL; self->priv->backend = NULL; + + self->priv->update_viewer_command = NULL; } static void exec_update_viewer(PkuiIcon *self) { - static const gchar *argv[] = { UPDATE_VIEWER_COMMAND, NULL }; + gchar **argv = NULL; + GError *error = NULL; GPid pid; - gboolean retval; g_return_if_fail(PKUI_IS_BACKEND(self->priv->backend)); + g_return_if_fail(self->priv->update_viewer_command != NULL); + + g_debug("executing command %s", self->priv->update_viewer_command); - g_debug("executing " UPDATE_VIEWER_COMMAND); + if (!g_shell_parse_argv(self->priv->update_viewer_command, NULL, + &argv, &error)) { + g_warning("Could not parse command: %s", error->message); + g_error_free(error); + return; + } - retval = g_spawn_async(NULL, (gchar **)argv, NULL, - G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL); - if (!retval) { - g_warning("Could not execute" UPDATE_VIEWER_COMMAND); + if (!g_spawn_async(NULL, argv, NULL, + G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, &pid, + &error)) { + g_warning("Could not execute command: %s", error->message); + g_error_free(error); return; } g_child_watch_add(pid, (GChildWatchFunc)update_viewer_exited, self); @@ -215,8 +230,9 @@ { PkuiIcon *self = PKUI_ICON(user_data); - if (strcmp(action, "install-updates") == 0) + if (strcmp(action, "install-updates") == 0) { exec_update_viewer(self); + } } static void @@ -224,32 +240,62 @@ guint updates_important) { gchar *message; + gchar *message_a; + gchar *message_b; gchar *title = updates_important ? + /* TRANSLATORS: This is a message without number mentioned */ ngettext("Important Software Update", "Important Software Updates", updates_important + updates_normal) : + /* TRANSLATORS: This is a message without number mentioned */ ngettext("Software Update", "Software Updates", updates_important + updates_normal); gchar *icon = updates_important ? "software-update-urgent" : "software-update-available"; - if (updates_important > 0) - if (updates_normal > 0) - message = g_strdup_printf(ngettext("There are %d " - "software updates available, %d of them is " - "important.", "There are %d software updates " - "available, %d of them are important.", - updates_important), - updates_normal + updates_important, + if (updates_important > 0) { + if (updates_normal > 0) { + message_a = g_strdup_printf( + /* + * TRANSLATORS: This sentence contains two plurals. + * Texts related to these plurals are mixed. That is + * why it is split in three parts. Fill first two parts + * as you need, and use them as %s in the last one to + * construct a sentence. Note that if the first form of + * plural relates only to singular form, it is never + * used, and dedicated shorter sentences are used. */ + ngettext("There is %d software update available,", + "There are %d software updates available,", + updates_normal + updates_important), + updates_normal + updates_important); + /* + * TRANSLATORS: This is the sentence part in the + * middle, form of which is related to the first + * number. If your language does not need it, simply + * use it as space or so. */ + message_b = ngettext("of it", "of them", + updates_normal + updates_important); + message = g_strdup_printf( + /* + * TRANSLATORS: This forms the sentence. If you need to + * swap parts, use %3$s and %1$s etc. Plurals are + * related to second number. */ + ngettext("%s %d %s is important.", + "%s %d %s are important.", updates_important), + message_a, updates_important, message_b); + g_free(message_a); + } else { + message = g_strdup_printf(ngettext("There is %d " + "important software update available.", + "There are %d important software updates " + "available.", updates_important), updates_important); - else - message = g_strdup_printf(ngettext("There is an " - "important software update available.", "There are " - "%d important software updates available.", - updates_important), updates_important); - else - message = g_strdup_printf(ngettext("There is a software update " - "available.", "There are %d software updates available.", + } + } else { + message = g_strdup_printf(ngettext("There is %d software " + "update available.", + "There are %d software updates available.", updates_normal), updates_normal); + } gtk_status_icon_set_tooltip(self->priv->status_icon, message); gtk_status_icon_set_from_icon_name(self->priv->status_icon, icon); @@ -262,10 +308,13 @@ , NULL #endif ); - notify_notification_add_action(self->priv->notification, - "install-updates", ngettext("Install Update", - "Install Updates", updates_normal + updates_important), - notification_handle_action, self, NULL); + if (self->priv->update_viewer_command != NULL) { + notify_notification_add_action(self->priv->notification, + "install-updates", ngettext("Install Update", + "Install Updates", + updates_normal + updates_important), + notification_handle_action, self, NULL); + } } else notify_notification_update(self->priv->notification, title, message, icon); @@ -323,14 +372,19 @@ { PkuiIcon *self = PKUI_ICON(user_data); - exec_update_viewer(self); + if (self->priv->update_viewer_command != NULL) { + exec_update_viewer(self); + } } PkuiIcon * -pkui_icon_new(guint startup_delay, guint check_interval) +pkui_icon_new(guint startup_delay, guint check_interval, + const gchar *update_viewer_command) { PkuiIcon *icon = g_object_new(PKUI_TYPE_ICON, NULL); + icon->priv->update_viewer_command = g_strdup((update_viewer_command != + NULL) ? update_viewer_command : UPDATE_VIEWER_COMMAND); icon->priv->backend = pkui_backend_new(startup_delay, check_interval); g_signal_connect(icon->priv->backend, "state-changed", G_CALLBACK(backend_state_changed), icon); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/pkui-icon.h new/pk-update-icon-2/pkui-icon.h --- old/pk-update-icon-1/pkui-icon.h 2014-02-07 21:57:36.000000000 +0100 +++ new/pk-update-icon-2/pkui-icon.h 2015-06-19 13:08:04.000000000 +0200 @@ -54,7 +54,7 @@ }; GType pkui_icon_get_type(void); -PkuiIcon *pkui_icon_new(guint startup_delay, guint check_interval); +PkuiIcon *pkui_icon_new(guint, guint, const gchar *); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/po/cs.po new/pk-update-icon-2/po/cs.po --- old/pk-update-icon-1/po/cs.po 2014-02-07 17:47:49.000000000 +0100 +++ new/pk-update-icon-2/po/cs.po 2015-06-19 15:49:55.000000000 +0200 @@ -2,108 +2,143 @@ # Copyright (C) 2011 Pavol Rusnak, Guido Berhoerster # This file is distributed under the same license as the pk-update-icon package. # Pavol Rusnak <[email protected]>, 2011. +# Stanislav Brabec <[email protected]>, 2015. # msgid "" msgstr "" "Project-Id-Version: pk-update-icon 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-20 13:27+0200\n" -"PO-Revision-Date: 2011-10-10 19:21+0200\n" -"Last-Translator: Pavol Rusnak <[email protected]>\n" +"POT-Creation-Date: 2015-06-18 22:56:02+0200\n" +"PO-Revision-Date: 2015-06-18 16:36+0200\n" +"Last-Translator: Stanislav Brabec <[email protected]>\n" "Language-Team: Czech\n" -"Language: czech\n" +"Language: cs\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==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../main.c:41 +#: ../main.c:42 +msgid "Command for starting the software update viewer" +msgstr "Příkaz spouštějící prohlížeč aktualizací softwaru" + +#: ../main.c:45 msgid "Set the delay in seconds before the first check for updates" -msgstr "" -"Nastavit prodlevu ve vteřinách před první kontrolou aktualizací" +msgstr "Nastaví prodlevu před první kontrolou aktualizací v sekundách" -#: ../main.c:44 +#: ../main.c:48 msgid "Set the interval in seconds between checks for updates" -msgstr "" -"Nastavit interval ve vteřinách mezi kontrolami aktualizací" +msgstr "Nastaví interval mezi kontrolami aktualizací v sekundách" -#: ../main.c:47 +#: ../main.c:51 msgid "Print the version number and exit" msgstr "Vypíše verzi a skončí" -#: ../main.c:59 +#: ../main.c:63 msgid "- display notifications about software updates" -msgstr "- zobrazit notifikace o softvérových aktualizacích" +msgstr "- zobrazení oznámení o aktualizacích softwaru" -#: ../pkui-icon.c:90 +#: ../pkui-icon.c:94 msgid "Software Updates" -msgstr "Softvérové aktualizace" +msgstr "Aktualizace softwaru" -#: ../pkui-icon.c:152 +#: ../pkui-icon.c:168 msgid "translators" -msgstr "Pavol Rusnak <[email protected]>" +msgstr "" +"Pavol Rusnak <[email protected]>\n" +"Stanislav Brabec <[email protected]>" -#: ../pkui-icon.c:180 +#: ../pkui-icon.c:196 msgid "_Check for Updates" -msgstr "_Skontrolovat aktualizace" +msgstr "_Zkontrolovat aktualizace" -#: ../pkui-icon.c:188 +#: ../pkui-icon.c:204 msgid "_About" msgstr "_O programu" -#: ../pkui-icon.c:227 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:247 msgid "Important Software Update" msgid_plural "Important Software Updates" -msgstr[0] "Důležitých aktualizací" -msgstr[1] "Důležitá aktualizace" -msgstr[2] "Důležité aktualizace" +msgstr[0] "Důležitá aktualizace softwaru" +msgstr[1] "Důležité aktualizace softwaru" +msgstr[2] "Důležité aktualizace softwaru" -#: ../pkui-icon.c:229 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:250 msgid "Software Update" msgid_plural "Software Updates" -msgstr[0] "Softvérových aktualizací" -msgstr[1] "Softvérová aktualizace" -msgstr[2] "Softvérové aktualizace" - -#: ../pkui-icon.c:236 +msgstr[0] "Aktualizace softwaru" +msgstr[1] "Aktualizace softwaru" +msgstr[2] "Aktualizace softwaru" + +#. +#. * TRANSLATORS: This sentence contains two plurals. +#. * Texts related to these plurals are mixed. That is +#. * why it is split in three parts. Fill first two parts +#. * as you need, and use them as %s in the last one to +#. * construct a sentence. Note that if the first form of +#. * plural relates only to singular form, it is never +#. * used, and dedicated shorter sentences are used. +#: ../pkui-icon.c:266 +#, c-format +msgid "There is %d software update available," +msgid_plural "There are %d software updates available," +msgstr[0] "Je k dispozici %d aktualizace softwaru, z níž" +msgstr[1] "Jsou k dispozici %d aktualizace softwaru, z nichž" +msgstr[2] "Je k dispozici %d aktualizací softwaru, z nichž" + +#. +#. * TRANSLATORS: This is the sentence part in the +#. * middle, form of which is related to the first +#. * number. If your language does not need it, simply +#. * use it as space or so. +#: ../pkui-icon.c:275 +msgid "of it" +msgid_plural "of them" +msgstr[0] "." +msgstr[1] "." +msgstr[2] "." + +#. +#. * TRANSLATORS: This forms the sentence. If you need to +#. * swap parts, use %3$s and %1$s etc. Plurals are +#. * related to second number. +#: ../pkui-icon.c:282 #, c-format -msgid "There are %d software updates available, %d of them is important." -msgid_plural "" -"There are %d software updates available, %d of them are important." -msgstr[0] "" -"Je k dispozici %d softvérových aktualizací, z toho %d je důležitých." -msgstr[1] "" -"Je k dispozici %d softvérových aktualizací, z toho %d je důležitá." -msgstr[2] "" -"Je k dispozici %d softvérových aktualizací, z toho %d jsou důležité." +msgid "%s %d %s is important." +msgid_plural "%s %d %s are important." +msgstr[0] "%s %d je důležitá%s" +msgstr[1] "%s %d jsou důležité%s" +msgstr[2] "%s %d je důležitých%s" -#: ../pkui-icon.c:244 +#: ../pkui-icon.c:287 #, c-format -msgid "There is an important software update available." +msgid "There is %d important software update available." msgid_plural "There are %d important software updates available." -msgstr[0] "Je k dispozici %d důležitých aktualizací." -msgstr[1] "Je k dispozici %d důležitá aktualizace." -msgstr[2] "Jsou k dispozici %d důležité aktualizace." +msgstr[0] "Je k dispozici %d důležitá aktualizace softwaru." +msgstr[1] "Jsou k dispozici %d důležité aktualizace softwaru." +msgstr[2] "Je k dispozici %d důležitých aktualizací softwaru." -#: ../pkui-icon.c:249 +#: ../pkui-icon.c:294 #, c-format -msgid "There is a software update available." +msgid "There is %d software update available." msgid_plural "There are %d software updates available." -msgstr[0] "Je k dispozici %d softvérových aktualizací." -msgstr[1] "Je k dispozici %d softvérová aktualizace." -msgstr[2] "Jsou k dispozici %d softvérové aktualizace." +msgstr[0] "Je k dispozici %d aktualizace softwaru." +msgstr[1] "Jsou k dispozici %d aktualizace softwaru." +msgstr[2] "Je k dispozici %d aktualizací softwaru." -#: ../pkui-icon.c:265 +#: ../pkui-icon.c:313 msgid "Install Update" msgid_plural "Install Updates" -msgstr[0] "Instalovat aktualizace" -msgstr[1] "Instalovat aktualizaci" +msgstr[0] "Instalovat aktualizaci" +msgstr[1] "Instalovat aktualizace" msgstr[2] "Instalovat aktualizace" #: ../pk-update-icon.desktop.in.h:1 msgid "PackageKit Update Applet" -msgstr "PackageKit Aktualizačný Applet" +msgstr "Aktualizační aplet PackageKit" #: ../pk-update-icon.desktop.in.h:2 msgid "Update Applet" -msgstr "Aktualizačný Applet" +msgstr "Aktualizační aplet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/po/de.po new/pk-update-icon-2/po/de.po --- old/pk-update-icon-1/po/de.po 2014-02-07 17:47:49.000000000 +0100 +++ new/pk-update-icon-2/po/de.po 2015-06-19 15:51:00.000000000 +0200 @@ -1,14 +1,14 @@ # pk-update-icon # Copyright (C) 2011 Pavol Rusnak, Guido Berhoerster # This file is distributed under the same license as the pk-update-icon package. -# Guido Berhoerster <[email protected]>, 2011. +# Guido Berhoerster <[email protected]>, 2015. # msgid "" msgstr "" "Project-Id-Version: pk-update-icon 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-20 13:27+0200\n" -"PO-Revision-Date: 2011-10-10 19:21+0200\n" +"POT-Creation-Date: 2015-06-18 22:51:12+0200\n" +"PO-Revision-Date: 2015-06-19 09:09+0200\n" "Last-Translator: Guido Berhoerster <[email protected]>\n" "Language-Team: German\n" "Language: de\n" @@ -17,79 +17,112 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../main.c:41 +#: ../main.c:42 +msgid "Command for starting the software update viewer" +msgstr "Befehl zum Starten des Software-Aktualisierungs-Betrachters" + +#: ../main.c:45 msgid "Set the delay in seconds before the first check for updates" msgstr "" "Bestimme die Verzögerung in Sekunden vor dem ersten Überprüfen auf " "Aktualisierungen" -#: ../main.c:44 +#: ../main.c:48 msgid "Set the interval in seconds between checks for updates" msgstr "" "Bestimme das Intervall in Sekunden zwischen dem Überprüfen auf " "Aktualisierungen" -#: ../main.c:47 +#: ../main.c:51 msgid "Print the version number and exit" msgstr "Zeige die Versionsnummer und breche ab" -#: ../main.c:59 +#: ../main.c:63 msgid "- display notifications about software updates" msgstr "- zeige Benachrichtigungen über Softwareaktualisierungen" -#: ../pkui-icon.c:90 +#: ../pkui-icon.c:94 msgid "Software Updates" msgstr "Softwareaktualisierungen" -#: ../pkui-icon.c:152 +#: ../pkui-icon.c:168 msgid "translators" msgstr "Guido Berhörster <[email protected]>" -#: ../pkui-icon.c:180 +#: ../pkui-icon.c:196 msgid "_Check for Updates" msgstr "Nach Aktualisierungen _Suchen" -#: ../pkui-icon.c:188 +#: ../pkui-icon.c:204 msgid "_About" msgstr "_Info" -#: ../pkui-icon.c:227 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:247 msgid "Important Software Update" msgid_plural "Important Software Updates" msgstr[0] "Wichtige Aktualisierung" msgstr[1] "Wichtige Aktualisierungen" -#: ../pkui-icon.c:229 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:250 msgid "Software Update" msgid_plural "Software Updates" msgstr[0] "Softwareaktualisierung" msgstr[1] "Softwareaktualisierungen" -#: ../pkui-icon.c:236 +#. +#. * TRANSLATORS: This sentence contains two plurals. +#. * Texts related to these plurals are mixed. That is +#. * why it is split in three parts. Fill first two parts +#. * as you need, and use them as %s in the last one to +#. * construct a sentence. Note that if the first form of +#. * plural relates only to singular form, it is never +#. * used, and dedicated shorter sentences are used. +#: ../pkui-icon.c:266 +#, c-format +msgid "There is %d software update available," +msgid_plural "There are %d software updates available," +msgstr[0] "Es ist %d Softwareaktualisierung verfügbar," +msgstr[1] "Es sind %d Softwareaktualisierungen verfügbar," + +#. +#. * TRANSLATORS: This is the sentence part in the +#. * middle, form of which is related to the first +#. * number. If your language does not need it, simply +#. * use it as space or so. +#: ../pkui-icon.c:275 +msgid "of it" +msgid_plural "of them" +msgstr[0] "davon" +msgstr[1] "davon" + +#. +#. * TRANSLATORS: This forms the sentence. If you need to +#. * swap parts, use %3$s and %1$s etc. Plurals are +#. * related to second number. +#: ../pkui-icon.c:282 #, c-format -msgid "There are %d software updates available, %d of them is important." -msgid_plural "" -"There are %d software updates available, %d of them are important." -msgstr[0] "" -"Es sind %d Softwareaktualisierungen verfügbar, davon ist %d wichtig." -msgstr[1] "" -"Es sind %d Softwareaktualisierungen verfügbar, davon sind %d wichtig." +msgid "%s %d %s is important." +msgid_plural "%s %d %s are important." +msgstr[0] "%1$s %3$s ist %2$d wichtig." +msgstr[1] "%1$s %3$s sind %2$d wichtig." -#: ../pkui-icon.c:244 +#: ../pkui-icon.c:287 #, c-format -msgid "There is an important software update available." +msgid "There is %d important software update available." msgid_plural "There are %d important software updates available." -msgstr[0] "Es ist eine wichtige Softwareaktualisierung verfügbar." +msgstr[0] "Es ist %d wichtige Softwareaktualisierung verfügbar." msgstr[1] "Es sind %d wichtige Softwareaktualisierungen verfügbar." -#: ../pkui-icon.c:249 +#: ../pkui-icon.c:294 #, c-format -msgid "There is a software update available." +msgid "There is %d software update available." msgid_plural "There are %d software updates available." -msgstr[0] "Eine Softwareaktualisierung ist verfügbar." +msgstr[0] "Es ist %d Softwareaktualisierung verfügbar." msgstr[1] "Es sind %d Softwareaktualisierungen verfügbar." -#: ../pkui-icon.c:265 +#: ../pkui-icon.c:313 msgid "Install Update" msgid_plural "Install Updates" msgstr[0] "Aktualisierung Installieren" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/po/fr.po new/pk-update-icon-2/po/fr.po --- old/pk-update-icon-1/po/fr.po 2014-02-07 17:47:49.000000000 +0100 +++ new/pk-update-icon-2/po/fr.po 2015-06-19 13:08:30.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: pk-update-icon 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-20 15:39+0200\n" +"POT-Creation-Date: 2015-06-18 22:51:12+0200\n" "PO-Revision-Date: 2001-10-20 15:40+0200\n" "Last-Translator: Vincent Untz <[email protected]>\n" "Language-Team: French\n" @@ -17,73 +17,111 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../main.c:41 +#: ../main.c:42 +msgid "Command for starting the software update viewer" +msgstr "" + +#: ../main.c:45 msgid "Set the delay in seconds before the first check for updates" -msgstr "Configure le délai en secondes avant la première vérification des mises à jour" +msgstr "" +"Configure le délai en secondes avant la première vérification des mises à " +"jour" -#: ../main.c:44 +#: ../main.c:48 msgid "Set the interval in seconds between checks for updates" -msgstr "Configure l'intervalle en seconde entre les vérifications des mises à jour" +msgstr "" +"Configure l'intervalle en seconde entre les vérifications des mises à jour" -#: ../main.c:47 +#: ../main.c:51 msgid "Print the version number and exit" msgstr "Affiche le numéro de version et quitte" -#: ../main.c:59 +#: ../main.c:63 msgid "- display notifications about software updates" msgstr "- affiche les notifications à propos des mises à jour des logiciels" -#: ../pkui-icon.c:90 +#: ../pkui-icon.c:94 msgid "Software Updates" msgstr "Mise à jour des logiciels" -#: ../pkui-icon.c:152 +#: ../pkui-icon.c:168 msgid "translators" msgstr "traducteurs" -#: ../pkui-icon.c:180 +#: ../pkui-icon.c:196 msgid "_Check for Updates" msgstr "_Vérifier les mises à jour" -#: ../pkui-icon.c:188 +#: ../pkui-icon.c:204 msgid "_About" msgstr "À _propos" -#: ../pkui-icon.c:227 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:247 msgid "Important Software Update" msgid_plural "Important Software Updates" msgstr[0] "Mise à jour importante d'un logiciel" msgstr[1] "Mises à jour importantes de logiciels" -#: ../pkui-icon.c:229 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:250 msgid "Software Update" msgid_plural "Software Updates" msgstr[0] "Mise à jour d'un logiciel" msgstr[1] "Mises à jour de logiciels" -#: ../pkui-icon.c:236 -#, c-format -msgid "There are %d software updates available, %d of them is important." -msgid_plural "" -"There are %d software updates available, %d of them are important." -msgstr[0] "Il y a %d mise à jour disponible, dont %d importante." -msgstr[1] "Il y a %d mises à jour disponibles, dont %d importantes." +#. +#. * TRANSLATORS: This sentence contains two plurals. +#. * Texts related to these plurals are mixed. That is +#. * why it is split in three parts. Fill first two parts +#. * as you need, and use them as %s in the last one to +#. * construct a sentence. Note that if the first form of +#. * plural relates only to singular form, it is never +#. * used, and dedicated shorter sentences are used. +#: ../pkui-icon.c:266 +#, fuzzy, c-format +msgid "There is %d software update available," +msgid_plural "There are %d software updates available," +msgstr[0] "Il y a une mise à jour disponible." +msgstr[1] "Il y a %d mises à jour disponibles." -#: ../pkui-icon.c:244 +#. +#. * TRANSLATORS: This is the sentence part in the +#. * middle, form of which is related to the first +#. * number. If your language does not need it, simply +#. * use it as space or so. +#: ../pkui-icon.c:275 +msgid "of it" +msgid_plural "of them" +msgstr[0] "" +msgstr[1] "" + +#. +#. * TRANSLATORS: This forms the sentence. If you need to +#. * swap parts, use %3$s and %1$s etc. Plurals are +#. * related to second number. +#: ../pkui-icon.c:282 #, c-format -msgid "There is an important software update available." +msgid "%s %d %s is important." +msgid_plural "%s %d %s are important." +msgstr[0] "" +msgstr[1] "" + +#: ../pkui-icon.c:287 +#, fuzzy, c-format +msgid "There is %d important software update available." msgid_plural "There are %d important software updates available." msgstr[0] "Il y a une mise à jour importante disponible." msgstr[1] "Il y a %d mises à jour importantes disponibles." -#: ../pkui-icon.c:249 -#, c-format -msgid "There is a software update available." +#: ../pkui-icon.c:294 +#, fuzzy, c-format +msgid "There is %d software update available." msgid_plural "There are %d software updates available." msgstr[0] "Il y a une mise à jour disponible." msgstr[1] "Il y a %d mises à jour disponibles." -#: ../pkui-icon.c:265 +#: ../pkui-icon.c:313 msgid "Install Update" msgid_plural "Install Updates" msgstr[0] "Installer la mise à jour" @@ -96,3 +134,9 @@ #: ../pk-update-icon.desktop.in.h:2 msgid "Update Applet" msgstr "Applet de mise à jour" + +#~ msgid "There are %d software updates available, %d of them is important." +#~ msgid_plural "" +#~ "There are %d software updates available, %d of them are important." +#~ msgstr[0] "Il y a %d mise à jour disponible, dont %d importante." +#~ msgstr[1] "Il y a %d mises à jour disponibles, dont %d importantes." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/po/id.po new/pk-update-icon-2/po/id.po --- old/pk-update-icon-1/po/id.po 2014-02-07 17:47:49.000000000 +0100 +++ new/pk-update-icon-2/po/id.po 2015-06-19 15:51:00.000000000 +0200 @@ -2,14 +2,14 @@ # Terjemahan bahasa inggris untuk paket pk-update-icon. # Copyright (C) 2011 Guido Berhoerster # This file is distributed under the same license as the pk-update-icon package. -# Guido Berhoerster <[email protected]>, 2011. +# Guido Berhoerster <[email protected]>, 2015. # msgid "" msgstr "" "Project-Id-Version: pk-update-icon 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-20 13:27+0200\n" -"PO-Revision-Date: 2011-10-20 10:50+0200\n" +"POT-Creation-Date: 2015-06-18 22:51:12+0200\n" +"PO-Revision-Date: 2015-06-19 09:12+0200\n" "Last-Translator: Guido Berhoerster <[email protected]>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -18,78 +18,110 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../main.c:41 +#: ../main.c:42 +msgid "Command for starting the software update viewer" +msgstr "Perintah untuk manjalankan Penampil Perangkat Lunak Pembaharuan-Pembaharuan" + +#: ../main.c:45 msgid "Set the delay in seconds before the first check for updates" msgstr "" "Aturlah penundaan dalam beberapa detik sebelum pemeriksaan pertama untuk " "Pembaharuan-Pembaharuan" -#: ../main.c:44 +#: ../main.c:48 msgid "Set the interval in seconds between checks for updates" msgstr "" "Aturlah Interval dalam beberapa detik diatara Pemeriksaan untuk Pembaharuan-" "Pembaharuan" -#: ../main.c:47 +#: ../main.c:51 msgid "Print the version number and exit" msgstr "Cetak Versi Angka dan Keluar" -#: ../main.c:59 +#: ../main.c:63 msgid "- display notifications about software updates" msgstr "" -#: ../pkui-icon.c:90 +#: ../pkui-icon.c:94 msgid "Software Updates" msgstr "Perangkat Lunak Pembaharuan-Pembaharuan" -#: ../pkui-icon.c:152 +#: ../pkui-icon.c:168 msgid "translators" msgstr "Guido Berhörster <[email protected]>" -#: ../pkui-icon.c:180 +#: ../pkui-icon.c:196 msgid "_Check for Updates" msgstr "Pemeriksaan untuk Pembaharuan-Pembaharuan" -#: ../pkui-icon.c:188 +#: ../pkui-icon.c:204 msgid "_About" msgstr "Tent_ang" -#: ../pkui-icon.c:227 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:247 msgid "Important Software Update" msgid_plural "Important Software Updates" msgstr[0] "Perangkat Lunak Pembaharuan yang penting" msgstr[1] "Perangkat Lunak Pembaharuan-Pembaharuan yang penting" -#: ../pkui-icon.c:229 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:250 msgid "Software Update" msgid_plural "Software Updates" msgstr[0] "Pembaharuan Perangkat Lunak" msgstr[1] "Pembaharuan-Pembaharuan Perangkat Lunak" -#: ../pkui-icon.c:236 +#. +#. * TRANSLATORS: This sentence contains two plurals. +#. * Texts related to these plurals are mixed. That is +#. * why it is split in three parts. Fill first two parts +#. * as you need, and use them as %s in the last one to +#. * construct a sentence. Note that if the first form of +#. * plural relates only to singular form, it is never +#. * used, and dedicated shorter sentences are used. +#: ../pkui-icon.c:266 +#, c-format +msgid "There is %d software update available," +msgid_plural "There are %d software updates available," +msgstr[0] "Tersedia %d Pembaharuan Perangkat Lunak," +msgstr[1] "Tersedia %d Pembaharuan-Pembaharuan Perangkat Lunak," + +#. +#. * TRANSLATORS: This is the sentence part in the +#. * middle, form of which is related to the first +#. * number. If your language does not need it, simply +#. * use it as space or so. +#: ../pkui-icon.c:275 +msgid "of it" +msgid_plural "of them" +msgstr[0] "diantaranya" + +#. +#. * TRANSLATORS: This forms the sentence. If you need to +#. * swap parts, use %3$s and %1$s etc. Plurals are +#. * related to second number. +#: ../pkui-icon.c:282 #, c-format -msgid "There are %d software updates available, %d of them is important." -msgid_plural "" -"There are %d software updates available, %d of them are important." -msgstr[0] "Tersedia Pembaharuan Perangkat Lunak, diantaranya adalah penting." -msgstr[1] "" -"Tersedia Pembaharuan-Pembaharuan Perangkat Lunak, diantaranya adalah penting." +msgid "%s %d %s is important." +msgid_plural "%s %d %s are important." +msgstr[0] "%1$s %3$s adalah %2$d yang penting." -#: ../pkui-icon.c:244 +#: ../pkui-icon.c:287 #, c-format -msgid "There is an important software update available." +msgid "There is %d important software update available." msgid_plural "There are %d important software updates available." -msgstr[0] "Tersedia sebuah Pembaharuan Perangkat Lunak yang penting." -msgstr[1] "Tersedia Pembaharuan-Pembaharuan Perangkat Lunak yang penting." +msgstr[0] "Tersedia %d Pembaharuan Perangkat Lunak yang penting." +msgstr[1] "Tersedia %d Pembaharuan-Pembaharuan Perangkat Lunak yang penting." -#: ../pkui-icon.c:249 +#: ../pkui-icon.c:294 #, c-format -msgid "There is a software update available." +msgid "There is %d software update available." msgid_plural "There are %d software updates available." -msgstr[0] "Tersedia sebuah Pembaharuan Perangkat Lunak." -msgstr[1] "Tersedia Pembaharuan-Pembaharuan Perangkat Lunak." +msgstr[0] "Tersedia %d Pembaharuan Perangkat Lunak." +msgstr[1] "Tersedia %d Pembaharuan-Pembaharuan Perangkat Lunak." -#: ../pkui-icon.c:265 +#: ../pkui-icon.c:313 msgid "Install Update" msgid_plural "Install Updates" msgstr[0] "Pasang Perangkat Lunak Pembaharuan" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-1/po/sk.po new/pk-update-icon-2/po/sk.po --- old/pk-update-icon-1/po/sk.po 2014-02-07 17:47:49.000000000 +0100 +++ new/pk-update-icon-2/po/sk.po 2015-06-19 13:08:30.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: pk-update-icon 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-20 13:27+0200\n" +"POT-Creation-Date: 2015-06-18 22:51:12+0200\n" "PO-Revision-Date: 2011-10-10 19:21+0200\n" "Last-Translator: Pavol Rusnak <[email protected]>\n" "Language-Team: Slovak\n" @@ -17,83 +17,115 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#: ../main.c:41 -msgid "Set the delay in seconds before the first check for updates" +#: ../main.c:42 +msgid "Command for starting the software update viewer" msgstr "" -"Nastaviť pauzu v sekundách pred prvou kontrolou aktualizácií" -#: ../main.c:44 +#: ../main.c:45 +msgid "Set the delay in seconds before the first check for updates" +msgstr "Nastaviť pauzu v sekundách pred prvou kontrolou aktualizácií" + +#: ../main.c:48 msgid "Set the interval in seconds between checks for updates" -msgstr "" -"Nastaviť interval v sekundách medzi kontrolami aktualizácií" +msgstr "Nastaviť interval v sekundách medzi kontrolami aktualizácií" -#: ../main.c:47 +#: ../main.c:51 msgid "Print the version number and exit" msgstr "Vypíše verziu a skončí" -#: ../main.c:59 +#: ../main.c:63 msgid "- display notifications about software updates" msgstr "- zobraziť notifikácie o softvérových aktualizáciách" -#: ../pkui-icon.c:90 +#: ../pkui-icon.c:94 msgid "Software Updates" msgstr "Softvérové aktualizácie" -#: ../pkui-icon.c:152 +#: ../pkui-icon.c:168 msgid "translators" msgstr "Pavol Rusnak <[email protected]>" -#: ../pkui-icon.c:180 +#: ../pkui-icon.c:196 msgid "_Check for Updates" msgstr "_Skontrolovať aktualizácie" -#: ../pkui-icon.c:188 +#: ../pkui-icon.c:204 msgid "_About" msgstr "_O programe" -#: ../pkui-icon.c:227 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:247 msgid "Important Software Update" msgid_plural "Important Software Updates" msgstr[0] "Dôležitých aktualizácií" msgstr[1] "Dôležitá aktualizácia" msgstr[2] "Dôležité aktualizácie" -#: ../pkui-icon.c:229 +#. TRANSLATORS: This is a message without number mentioned +#: ../pkui-icon.c:250 msgid "Software Update" msgid_plural "Software Updates" msgstr[0] "Softvérových aktualizácií" msgstr[1] "Softvérová aktualizácia" msgstr[2] "Softvérové aktualizácie" -#: ../pkui-icon.c:236 -#, c-format -msgid "There are %d software updates available, %d of them is important." -msgid_plural "" -"There are %d software updates available, %d of them are important." +#. +#. * TRANSLATORS: This sentence contains two plurals. +#. * Texts related to these plurals are mixed. That is +#. * why it is split in three parts. Fill first two parts +#. * as you need, and use them as %s in the last one to +#. * construct a sentence. Note that if the first form of +#. * plural relates only to singular form, it is never +#. * used, and dedicated shorter sentences are used. +#: ../pkui-icon.c:266 +#, fuzzy, c-format +msgid "There is %d software update available," +msgid_plural "There are %d software updates available," +msgstr[0] "Je k dispozícii %d softvérových aktualizácií." +msgstr[1] "Je k dispozícii %d softvérová aktualizácia." +msgstr[2] "Sú k dispozícii %d softvérové aktualizácie." + +#. +#. * TRANSLATORS: This is the sentence part in the +#. * middle, form of which is related to the first +#. * number. If your language does not need it, simply +#. * use it as space or so. +#: ../pkui-icon.c:275 +msgid "of it" +msgid_plural "of them" msgstr[0] "" -"Je k dispozícii %d softvérových aktualizácií, z toho %d je dôležitých." msgstr[1] "" -"Je k dispozícii %d softvérových aktualizácií, z toho %d je dôležitá." msgstr[2] "" -"Je k dispozícii %d softvérových aktualizácií, z toho %d sú dôležité." -#: ../pkui-icon.c:244 +#. +#. * TRANSLATORS: This forms the sentence. If you need to +#. * swap parts, use %3$s and %1$s etc. Plurals are +#. * related to second number. +#: ../pkui-icon.c:282 #, c-format -msgid "There is an important software update available." +msgid "%s %d %s is important." +msgid_plural "%s %d %s are important." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../pkui-icon.c:287 +#, fuzzy, c-format +msgid "There is %d important software update available." msgid_plural "There are %d important software updates available." msgstr[0] "Je k dispozícii %d dôležitých aktualizácií." msgstr[1] "Je k dispozícii %d dôležitá aktualizácia." msgstr[2] "Sú k dispozícii %d dôležité aktualizácie." -#: ../pkui-icon.c:249 -#, c-format -msgid "There is a software update available." +#: ../pkui-icon.c:294 +#, fuzzy, c-format +msgid "There is %d software update available." msgid_plural "There are %d software updates available." msgstr[0] "Je k dispozícii %d softvérových aktualizácií." msgstr[1] "Je k dispozícii %d softvérová aktualizácia." msgstr[2] "Sú k dispozícii %d softvérové aktualizácie." -#: ../pkui-icon.c:265 +#: ../pkui-icon.c:313 msgid "Install Update" msgid_plural "Install Updates" msgstr[0] "Inštalovať aktualizácie" @@ -107,3 +139,13 @@ #: ../pk-update-icon.desktop.in.h:2 msgid "Update Applet" msgstr "Aktualizačný Applet" + +#~ msgid "There are %d software updates available, %d of them is important." +#~ msgid_plural "" +#~ "There are %d software updates available, %d of them are important." +#~ msgstr[0] "" +#~ "Je k dispozícii %d softvérových aktualizácií, z toho %d je dôležitých." +#~ msgstr[1] "" +#~ "Je k dispozícii %d softvérových aktualizácií, z toho %d je dôležitá." +#~ msgstr[2] "" +#~ "Je k dispozícii %d softvérových aktualizácií, z toho %d sú dôležité."
