Hello community, here is the log from the commit of package gcab for openSUSE:Factory checked in at 2018-12-19 13:45:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcab (Old) and /work/SRC/openSUSE:Factory/.gcab.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcab" Wed Dec 19 13:45:53 2018 rev:12 rq:657454 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gcab/gcab.changes 2018-06-02 11:55:26.776742043 +0200 +++ /work/SRC/openSUSE:Factory/.gcab.new.28833/gcab.changes 2018-12-19 13:45:55.487576739 +0100 @@ -1,0 +2,13 @@ +Sun Dec 9 19:56:55 UTC 2018 - [email protected] + +- Update to version 1.2: + + build-sys: + - Fix installing the includes. + - Don't require git to build. + + gcab: Fix regression. Apparently, rewinding should reset the + CDATA state. + + Updated translations. +- Drop gcab-fix-installing-the-includes.patch and + gcab-revert-git-dep.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- gcab-1.1.tar.xz gcab-fix-installing-the-includes.patch gcab-revert-git-dep.patch New: ---- gcab-1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcab.spec ++++++ --- /var/tmp/diff_new_pack.5sfMpa/_old 2018-12-19 13:45:56.591575196 +0100 +++ /var/tmp/diff_new_pack.5sfMpa/_new 2018-12-19 13:45:56.591575196 +0100 @@ -12,22 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gcab -Version: 1.1 +Version: 1.2 Release: 0 Summary: Cabinet file library and tool License: LGPL-2.1-or-later Group: Productivity/Archiving/Compression Url: http://ftp.gnome.org/pub/GNOME/sources/gcab -Source0: http://download.gnome.org/sources/gcab/1.1/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gcab-revert-git-dep.patch bgo#793406 [email protected] -- Revert git dependency -Patch0: gcab-revert-git-dep.patch -# PATCH-FIX-UPSTREAM gcab-fix-installing-the-includes.patch bgo#793388 -- build-sys: fix installing the includes -Patch1: gcab-fix-installing-the-includes.patch +Source0: http://download.gnome.org/sources/gcab/1.2/%{name}-%{version}.tar.xz + BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig ++++++ gcab-1.1.tar.xz -> gcab-1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/NEWS new/gcab-1.2/NEWS --- old/gcab-1.1/NEWS 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/NEWS 2018-12-09 17:53:57.000000000 +0100 @@ -1,3 +1,8 @@ +v1.2 +~~~~ + +No news yet. + v1.1 ~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/RELEASE new/gcab-1.2/RELEASE --- old/gcab-1.1/RELEASE 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/RELEASE 2018-12-09 17:53:57.000000000 +0100 @@ -2,10 +2,10 @@ 1. Write NEWS entries for GCab in the same format as usual. -git shortlog v1.0.. | grep -i -v trivial | grep -v Merge > NEWS.new +git shortlog v1.1.. | grep -i -v trivial | grep -v Merge > NEWS.new -------------------------------------------------------------------------------- -v1.1 +v1.2 ~~~~ Notes: @@ -18,8 +18,8 @@ 4. Commit changes: # MAKE SURE THESE ARE CORRECT -export release_version="1.1" -export release_tag="v1.1" +export release_version="1.2" +export release_tag="v1.2" git commit -a -m "Release ${release_version}" git tag -s -f -m "Release ${release_version}" "${release_tag}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/libgcab/gcab-folder.c new/gcab-1.2/libgcab/gcab-folder.c --- old/gcab-1.1/libgcab/gcab-folder.c 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/libgcab/gcab-folder.c 2018-12-09 17:53:57.000000000 +0100 @@ -423,6 +423,7 @@ g_autoptr(GSList) files = NULL; g_autoptr(cdata_t) cdata = g_new0 (cdata_t, 1); guint32 nubytes = 0; + guint8 *reserved; /* never loaded from a stream */ g_assert (self->cfolder != NULL); @@ -433,7 +434,7 @@ files = g_slist_sort (g_slist_copy (self->files), (GCompareFunc)sort_by_offset); /* this is allocated for every block, but currently unused */ - cdata->reserved = g_malloc (res_data); + cdata->reserved = reserved = g_malloc (res_data); for (f = files; f != NULL; f = f->next) { GCabFile *file = f->data; @@ -454,6 +455,8 @@ if (!g_seekable_seek (G_SEEKABLE (data), self->cfolder->offsetdata, G_SEEK_SET, cancellable, error)) return FALSE; + bzero(cdata, sizeof(cdata_t)); + cdata->reserved = reserved; nubytes = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/libgcab/meson.build new/gcab-1.2/libgcab/meson.build --- old/gcab-1.1/libgcab/meson.build 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/libgcab/meson.build 2018-12-09 17:53:57.000000000 +0100 @@ -9,7 +9,7 @@ c_template : 'gcab-enums.c.etemplate', h_template : 'gcab-enums.h.etemplate', install_header : true, - install_dir : 'include/libgcab-1.0/libgcab', + install_dir : join_paths(get_option('includedir'), 'libgcab-1.0/libgcab'), symbol_prefix : 'gcab', identifier_prefix : 'GCab', ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/meson.build new/gcab-1.2/meson.build --- old/gcab-1.1/meson.build 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/meson.build 2018-12-09 17:53:57.000000000 +0100 @@ -1,11 +1,15 @@ project('gcab', 'c', - version : '1.1', + version : '1.2', license : 'LGPL-2.1+', meson_version : '>=0.37.0', default_options : ['warning_level=2', 'c_std=c99'], ) -git_version = run_command(['git', 'describe', '--abbrev=4', 'HEAD']).stdout().strip().split('-') +git_version = [] +git = find_program('git', required: false) +if git.found() + git_version = run_command(git, 'describe', '--abbrev=4', '--dirty').stdout().strip().split('-') +endif # libtool versioning lt_current = '0' @@ -92,15 +96,19 @@ gnome = import('gnome') i18n = import('i18n') -conf = configuration_data() -conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) -conf.set_quoted('PACKAGE_NAME', meson.project_name()) -if git_version.length() == 3 - conf.set_quoted('PACKAGE_STRING', '@0@ @1@.@2@-@3@'.format(meson.project_name(), git_version[0], git_version[1], git_version[2])) +if git_version.length() >= 3 + package_string = '@0@ @1@.@2@-@3@'.format(meson.project_name(), git_version[0], git_version[1], git_version[2]) + if git_version.length() == 4 + package_string = '@0@-dirty'.format(package_string) + endif else - conf.set_quoted('PACKAGE_STRING', '@0@ v@1@'.format(meson.project_name(), meson.project_version())) + package_string = '@0@ v@1@'.format(meson.project_name(), meson.project_version()) endif +conf = configuration_data() +conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +conf.set_quoted('PACKAGE_NAME', meson.project_name()) +conf.set_quoted('PACKAGE_STRING', package_string) conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) conf.set_quoted('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=msitools&component=gcab') conf.set_quoted('TESTDATADIR', join_paths(meson.source_root(), 'tests')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/po/da.po new/gcab-1.2/po/da.po --- old/gcab-1.1/po/da.po 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/po/da.po 2018-12-09 17:53:57.000000000 +0100 @@ -1,102 +1,91 @@ # Danish translation for gcab. -# Copyright (C) 2017 gcab's COPYRIGHT HOLDER +# Copyright (C) 2018 gcab's COPYRIGHT HOLDER # This file is distributed under the same license as the gcab package. -# joehansen <[email protected]>, 2017. +# joehansen <[email protected]>, 2017, 2018. +# Alan Mortensen <[email protected]>, 2018. # msgid "" msgstr "" "Project-Id-Version: gcab master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; -"product=msitools&keywords=I18N+L10N&component=gcab\n" -"POT-Creation-Date: 2017-02-22 19:27+0000\n" -"PO-Revision-Date: 2017-02-22 19:10+0100\n" -"Last-Translator: Joe Hansen <[email protected]>\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gcab/issues\n"; +"POT-Creation-Date: 2018-06-10 16:11+0000\n" +"PO-Revision-Date: 2018-12-06 20:59+0100\n" +"Last-Translator: Alan Mortensen <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\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 2.0.6\n" -#: ../gcab.c:62 -#, c-format -msgid "Removing leading '%s' from member names" -msgstr "Fjerner foranstillet “%s” fra elementnavne" - -#: ../gcab.c:74 -#, c-format -msgid "Dumping %s data to: %s ...\n" -msgstr "Dumper %s-data til: %s …\n" - -#: ../gcab.c:82 -#, c-format -msgid "can't write file %s: %s" -msgstr "kan ikke skrive filen %s: %s" +#: src/gcab.c:82 +msgid "Dumping data to:" +msgstr "Dumper data til:" -#: ../gcab.c:109 +#: src/gcab.c:114 msgid "Print program version" msgstr "Vis programversion" -#: ../gcab.c:110 +#: src/gcab.c:115 msgid "Be verbose" msgstr "Vær uddybende" -#: ../gcab.c:111 +#: src/gcab.c:116 msgid "Create archive" msgstr "Opret arkiv" -#: ../gcab.c:112 +#: src/gcab.c:117 msgid "Extract all files" msgstr "Udtræk alle filer" -#: ../gcab.c:113 +#: src/gcab.c:118 msgid "Dump reserved and extra data" msgstr "Dump reserverede og ekstra data" -#: ../gcab.c:114 +#: src/gcab.c:119 msgid "List content" msgstr "Vis indhold" -#: ../gcab.c:115 +#: src/gcab.c:120 msgid "List content with file details" msgstr "Vis indhold med fildetaljer" -#: ../gcab.c:116 +#: src/gcab.c:121 msgid "Change to directory DIR" msgstr "Ændr til mappen MAPPE" -#: ../gcab.c:116 +#: src/gcab.c:121 msgid "DIR" msgstr "MAPPE" -#: ../gcab.c:117 +#: src/gcab.c:122 msgid "Use zip compression" msgstr "Brug zip-komprimering" -#: ../gcab.c:118 +#: src/gcab.c:123 msgid "Do not include path" msgstr "Inkluder ikke sti" -#: ../gcab.c:119 +#: src/gcab.c:124 msgid "Reserve space in cabinet for signing (e.g. -s 6144 reserves 6K bytes)" msgstr "" "Reserver plads i cabinet for underskrivning (f.eks. -s 6144 reserverer 6K " "byte)" -#: ../gcab.c:120 +#: src/gcab.c:125 msgid "FILE INPUT_FILES..." msgstr "FIL INDDATA_FILER …" -#: ../gcab.c:134 +#: src/gcab.c:139 msgid "- create a Cabinet file" msgstr "- opret en Cabinetfil" -#: ../gcab.c:135 -#, c-format -msgid "Report bugs to <%s>" -msgstr "Rapporter fejl til <%s>" +#: src/gcab.c:140 +msgid "Report bugs to:" +msgstr "Rapportér fejl til:" -#: ../gcab.c:138 +#: src/gcab.c:142 msgid "" "gcab saves many files together into a cabinet archive, and can restore\n" "individual files from the archive." @@ -104,72 +93,69 @@ "gcab gemmer mange filer sammen i et cabinet-arkiv, og kan gendanne\n" "individuelle filer fra arkivet." -#: ../gcab.c:145 -#, c-format -msgid "option parsing failed: %s\n" -msgstr "tilvalgsfortolkning mislykkedes: %s\n" - -#: ../gcab.c:154 -msgid "Please specify a single operation." -msgstr "Angiv venligst en enkelt operation." - -#: ../gcab.c:157 -msgid "cabinet file must be specified." -msgstr "cabinetfil skal angives." - -#: ../gcab.c:171 -#, c-format -msgid "can't open %s for reading: %s\n" -msgstr "kan ikke åbne %s for læsning: %s\n" - -#: ../gcab.c:173 -#, c-format -msgid "error reading %s: %s\n" -msgstr "der opstod en fejl under læsning af %s: %s\n" - -#: ../gcab.c:208 -#, c-format -msgid "error during extraction: %s" -msgstr "der opstod en fejl under udtrækning: %s" - -#: ../gcab.c:220 -#, c-format -msgid "error while reading signature: %s" -msgstr "der opstod en fejl under læsning af signatur: %s" - -#: ../gcab.c:231 -msgid "please specify input files." -msgstr "angiv venligst inddatafiler." - -#: ../gcab.c:249 -#, c-format -msgid "Can't add file %s: %s" -msgstr "Kan ikke tilføje filen %s: %s" - -#: ../gcab.c:259 -msgid "no files to be archived." -msgstr "der er ingen filer at arkivere." - -#: ../gcab.c:265 -#, c-format -msgid "can't create cab file %s: %s" -msgstr "kan ikke oprette cab-filen %s: %s" - -#: ../gcab.c:269 -#, c-format -msgid "can't add folder to cab file %s: %s" -msgstr "kan ikke tilføje mappe til cab-filen %s: %s" - -#: ../gcab.c:277 -#, c-format -msgid "can't write cab file %s: %s" -msgstr "kan ikke skrive cab-filen %s: %s" - -#: ../libgcab/cabinet.c:20 ../libgcab/cabinet.c:468 -#, c-format -msgid "unsupported compression method %d" -msgstr "komprimeringsmetoden %d understøttes ikke" - -#: ../libgcab/cabinet.c:482 -msgid "incorrect checksum detected" -msgstr "en fejlagtig kontrolsum blev detekteret" +#: src/gcab.c:149 +msgid "Option parsing failed" +msgstr "Tilvalgsfortolkning mislykkedes" + +#: src/gcab.c:159 +msgid "Please specify a single operation" +msgstr "Angiv venligst en enkelt operation" + +#: src/gcab.c:164 +msgid "Cabinet file must be specified" +msgstr "Cabinetfil skal angives" + +#: src/gcab.c:180 +msgid "Cannot open file for reading" +msgstr "Kan ikke åbne fil for læsning" + +#: src/gcab.c:184 +msgid "Error reading" +msgstr "Fejl under læsning" + +#: src/gcab.c:220 +msgid "Error during extraction" +msgstr "Fejl under udtrækning" + +#: src/gcab.c:235 +msgid "Error while reading signature" +msgstr "Fejl under læsning af signatur" + +#: src/gcab.c:247 +msgid "No input files specified" +msgstr "Ingen inputfiler angivet" + +#: src/gcab.c:266 +msgid "Cannot add file" +msgstr "Kan ikke tilføje fil" + +#: src/gcab.c:272 +msgid "No files to be archived" +msgstr "Der er ingen filer at arkivere" + +#: src/gcab.c:280 +msgid "Cannot create cab file" +msgstr "Kan ikke oprette cab-fil" + +#: src/gcab.c:286 +msgid "Cannot add folder to cab file" +msgstr "Kan ikke tilføje mappe til cab-fil" + +#: src/gcab.c:296 +msgid "Cannot write cab file" +msgstr "Kan ikke skrive cab-fil" + +#~ msgid "Removing leading '%s' from member names" +#~ msgstr "Fjerner foranstillet “%s” fra elementnavne" + +#~ msgid "can't write file %s: %s" +#~ msgstr "kan ikke skrive filen %s: %s" + +#~ msgid "please specify input files." +#~ msgstr "angiv venligst inddatafiler." + +#~ msgid "unsupported compression method %d" +#~ msgstr "komprimeringsmetoden %d understøttes ikke" + +#~ msgid "incorrect checksum detected" +#~ msgstr "en fejlagtig kontrolsum blev detekteret" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/po/sr.po new/gcab-1.2/po/sr.po --- old/gcab-1.1/po/sr.po 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/po/sr.po 2018-12-09 17:53:57.000000000 +0100 @@ -1,16 +1,16 @@ # Serbian translation for gcab. -# Copyright (C) 2013 gcab's COPYRIGHT HOLDER +# Copyright © 2013 gcab's COPYRIGHT HOLDER # This file is distributed under the same license as the gcab package. -# Мирослав Николић <[email protected]>, 2013—2015. +# Мирослав Николић <[email protected]>, 2013—2018. msgid "" msgstr "" "Project-Id-Version: gcab master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gcab&ke"; -"ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-08-25 20:08+0000\n" -"PO-Revision-Date: 2015-12-30 09:58+0200\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=msitoo"; +"ls&keywords=I18N+L10N&component=gcab\n" +"POT-Creation-Date: 2018-01-26 14:27+0000\n" +"PO-Revision-Date: 2018-02-23 00:34+0200\n" "Last-Translator: Мирослав Николић <[email protected]>\n" -"Language-Team: Serbian <[email protected]>\n" +"Language-Team: српски <[email protected]>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,84 +19,74 @@ "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../gcab.c:62 -#, c-format -msgid "Removing leading '%s' from member names" -msgstr "Уклањам водеће „%s“ из назива чланова" - -#: ../gcab.c:74 -#, c-format -msgid "Dumping %s data to: %s ...\n" -msgstr "Избацујем %s податке до: %s ...\n" - -#: ../gcab.c:82 -#, c-format -msgid "can't write file %s: %s" -msgstr "не могу да запишем датотеку „%s“: %s" +#: src/gcab.c:82 +#| msgid "Dumping %s data to: %s ...\n" +msgid "Dumping data to:" +msgstr "Избацујем податке у:" -#: ../gcab.c:109 +#: src/gcab.c:114 msgid "Print program version" msgstr "Исписује издање програма" -#: ../gcab.c:110 +#: src/gcab.c:115 msgid "Be verbose" msgstr "Опширнији испис" -#: ../gcab.c:111 +#: src/gcab.c:116 msgid "Create archive" msgstr "Прави архиву" -#: ../gcab.c:112 +#: src/gcab.c:117 msgid "Extract all files" msgstr "Извлачи све датотеке" -#: ../gcab.c:113 +#: src/gcab.c:118 msgid "Dump reserved and extra data" msgstr "Избацује резервисане и посебне податке" -#: ../gcab.c:114 +#: src/gcab.c:119 msgid "List content" msgstr "Исписује садржај" -#: ../gcab.c:115 +#: src/gcab.c:120 msgid "List content with file details" msgstr "Исписује садржај са појединостима датотеке" -#: ../gcab.c:116 +#: src/gcab.c:121 msgid "Change to directory DIR" msgstr "Прелази у директоријум ДИР" -#: ../gcab.c:116 +#: src/gcab.c:121 msgid "DIR" msgstr "ДИР" -#: ../gcab.c:117 +#: src/gcab.c:122 msgid "Use zip compression" msgstr "Користи зип сажимање" -#: ../gcab.c:118 +#: src/gcab.c:123 msgid "Do not include path" msgstr "Не укључује путању" -#: ../gcab.c:119 +#: src/gcab.c:124 msgid "Reserve space in cabinet for signing (e.g. -s 6144 reserves 6K bytes)" msgstr "" "Обезбеђује простор у кабинету за потпис (нпр. „-s 6144“ обезбеђује 6K бајта)" -#: ../gcab.c:120 +#: src/gcab.c:125 msgid "FILE INPUT_FILES..." msgstr "УЛАЗНЕ_ДАТОТЕКЕ ДАТОТЕКЕ..." -#: ../gcab.c:134 +#: src/gcab.c:139 msgid "- create a Cabinet file" msgstr "— направите Кабинет датотеку" -#: ../gcab.c:135 -#, c-format -msgid "Report bugs to <%s>" -msgstr "Грешке пријавите на <%s>" +#: src/gcab.c:140 +#| msgid "Report bugs to <%s>" +msgid "Report bugs to:" +msgstr "Грешке пријавите на:" -#: ../gcab.c:138 +#: src/gcab.c:142 msgid "" "gcab saves many files together into a cabinet archive, and can restore\n" "individual files from the archive." @@ -104,72 +94,82 @@ "гкаб чува заједно много датотека у кабинет архиви, и може да врати\n" "појединачне датотеке из архиве." -#: ../gcab.c:145 -#, c-format -msgid "option parsing failed: %s\n" -msgstr "није успела обрада опције: %s\n" - -#: ../gcab.c:154 -msgid "Please specify a single operation." -msgstr "Молим наведите једну радњу." - -#: ../gcab.c:157 -msgid "cabinet file must be specified." -msgstr "мора бити наведена кабинет датотека." - -#: ../gcab.c:171 -#, c-format -msgid "can't open %s for reading: %s\n" -msgstr "не могу да отворим „%s“ за читање: %s\n" - -#: ../gcab.c:173 -#, c-format -msgid "error reading %s: %s\n" -msgstr "грешка читања „%s“: %s\n" - -#: ../gcab.c:208 -#, c-format -msgid "error during extraction: %s" -msgstr "грешка приликом извлачења: %s" - -#: ../gcab.c:220 -#, c-format -msgid "error while reading signature: %s" -msgstr "грешка приликом читања потписа: %s" - -#: ../gcab.c:231 -msgid "please specify input files." -msgstr "молим наведите улазне датотеке." - -#: ../gcab.c:249 -#, c-format -msgid "Can't add file %s: %s" -msgstr "Не могу да додам датотеку „%s“: %s" - -#: ../gcab.c:259 -msgid "no files to be archived." -msgstr "нема датотека за архивирање." - -#: ../gcab.c:265 -#, c-format -msgid "can't create cab file %s: %s" -msgstr "не могу да направим каб датотеку „%s“: %s" - -#: ../gcab.c:269 -#, c-format -msgid "can't add folder to cab file %s: %s" -msgstr "не могу да додам фасциклу у каб датотеку„%s“: %s" - -#: ../gcab.c:277 -#, c-format -msgid "can't write cab file %s: %s" -msgstr "не могу да запишем каб датотеку „%s“: %s" - -#: ../libgcab/cabinet.c:20 ../libgcab/cabinet.c:468 -#, c-format -msgid "unsupported compression method %d" -msgstr "неподржан режим паковања „%d“" - -#: ../libgcab/cabinet.c:482 -msgid "incorrect checksum detected" -msgstr "откривена је неисправна сума провере" +#: src/gcab.c:149 +#| msgid "option parsing failed: %s\n" +msgid "Option parsing failed" +msgstr "Није успела обрада опције" + +#: src/gcab.c:159 +#| msgid "Please specify a single operation." +msgid "Please specify a single operation" +msgstr "Наведите једну радњу" + +#: src/gcab.c:164 +#| msgid "cabinet file must be specified." +msgid "Cabinet file must be specified" +msgstr "Мора бити наведена кабинет датотека" + +#: src/gcab.c:180 +#| msgid "can't open %s for reading: %s\n" +msgid "Cannot open file for reading" +msgstr "Не могу да отворим датотеку за читање" + +#: src/gcab.c:184 +#| msgid "error reading %s: %s\n" +msgid "Error reading" +msgstr "Грешка читања" + +#: src/gcab.c:220 +#| msgid "error during extraction: %s" +msgid "Error during extraction" +msgstr "Грешка приликом извлачења" + +#: src/gcab.c:235 +#| msgid "error while reading signature: %s" +msgid "Error while reading signature" +msgstr "Грешка приликом читања потписа" + +#: src/gcab.c:247 +#| msgid "cabinet file must be specified." +msgid "No input files specified" +msgstr "Нису наведене улазне датотеке" + +#: src/gcab.c:266 +#| msgid "Can't add file %s: %s" +msgid "Cannot add file" +msgstr "Не могу да додам датотеку" + +#: src/gcab.c:272 +#| msgid "no files to be archived." +msgid "No files to be archived" +msgstr "Нема датотека за архивирање" + +#: src/gcab.c:280 +#| msgid "can't create cab file %s: %s" +msgid "Cannot create cab file" +msgstr "Не могу да направим каб датотеку" + +#: src/gcab.c:286 +#| msgid "can't add folder to cab file %s: %s" +msgid "Cannot add folder to cab file" +msgstr "Не могу да додам фасциклу у каб датотеку" + +#: src/gcab.c:296 +#| msgid "can't write cab file %s: %s" +msgid "Cannot write cab file" +msgstr "Не могу да запишем каб датотеку" + +#~ msgid "Removing leading '%s' from member names" +#~ msgstr "Уклањам водеће „%s“ из назива чланова" + +#~ msgid "can't write file %s: %s" +#~ msgstr "не могу да запишем датотеку „%s“: %s" + +#~ msgid "please specify input files." +#~ msgstr "молим наведите улазне датотеке." + +#~ msgid "unsupported compression method %d" +#~ msgstr "неподржан режим паковања „%d“" + +#~ msgid "incorrect checksum detected" +#~ msgstr "откривена је неисправна сума провере" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcab-1.1/po/[email protected] new/gcab-1.2/po/[email protected] --- old/gcab-1.1/po/[email protected] 2018-02-09 13:44:30.000000000 +0100 +++ new/gcab-1.2/po/[email protected] 2018-12-09 17:53:57.000000000 +0100 @@ -1,17 +1,17 @@ # Serbian translation for gcab. -# Copyright (C) 2013 gcab's COPYRIGHT HOLDER +# Copyright © 2013 gcab's COPYRIGHT HOLDER # This file is distributed under the same license as the gcab package. -# Miroslav Nikolić <[email protected]>, 2013—2015. +# Miroslav Nikolić <[email protected]>, 2013—2018. msgid "" msgstr "" "Project-Id-Version: gcab master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gcab&ke"; -"ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-08-25 20:08+0000\n" -"PO-Revision-Date: 2015-12-30 09:58+0200\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=msitoo"; +"ls&keywords=I18N+L10N&component=gcab\n" +"POT-Creation-Date: 2018-01-26 14:27+0000\n" +"PO-Revision-Date: 2018-02-23 00:34+0200\n" "Last-Translator: Miroslav Nikolić <[email protected]>\n" -"Language-Team: Serbian <[email protected]>\n" -"Language: sr@latin\n" +"Language-Team: srpski <[email protected]>\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,84 +19,74 @@ "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../gcab.c:62 -#, c-format -msgid "Removing leading '%s' from member names" -msgstr "Uklanjam vodeće „%s“ iz naziva članova" - -#: ../gcab.c:74 -#, c-format -msgid "Dumping %s data to: %s ...\n" -msgstr "Izbacujem %s podatke do: %s ...\n" - -#: ../gcab.c:82 -#, c-format -msgid "can't write file %s: %s" -msgstr "ne mogu da zapišem datoteku „%s“: %s" +#: src/gcab.c:82 +#| msgid "Dumping %s data to: %s ...\n" +msgid "Dumping data to:" +msgstr "Izbacujem podatke u:" -#: ../gcab.c:109 +#: src/gcab.c:114 msgid "Print program version" msgstr "Ispisuje izdanje programa" -#: ../gcab.c:110 +#: src/gcab.c:115 msgid "Be verbose" msgstr "Opširniji ispis" -#: ../gcab.c:111 +#: src/gcab.c:116 msgid "Create archive" msgstr "Pravi arhivu" -#: ../gcab.c:112 +#: src/gcab.c:117 msgid "Extract all files" msgstr "Izvlači sve datoteke" -#: ../gcab.c:113 +#: src/gcab.c:118 msgid "Dump reserved and extra data" msgstr "Izbacuje rezervisane i posebne podatke" -#: ../gcab.c:114 +#: src/gcab.c:119 msgid "List content" msgstr "Ispisuje sadržaj" -#: ../gcab.c:115 +#: src/gcab.c:120 msgid "List content with file details" msgstr "Ispisuje sadržaj sa pojedinostima datoteke" -#: ../gcab.c:116 +#: src/gcab.c:121 msgid "Change to directory DIR" msgstr "Prelazi u direktorijum DIR" -#: ../gcab.c:116 +#: src/gcab.c:121 msgid "DIR" msgstr "DIR" -#: ../gcab.c:117 +#: src/gcab.c:122 msgid "Use zip compression" msgstr "Koristi zip sažimanje" -#: ../gcab.c:118 +#: src/gcab.c:123 msgid "Do not include path" msgstr "Ne uključuje putanju" -#: ../gcab.c:119 +#: src/gcab.c:124 msgid "Reserve space in cabinet for signing (e.g. -s 6144 reserves 6K bytes)" msgstr "" "Obezbeđuje prostor u kabinetu za potpis (npr. „-s 6144“ obezbeđuje 6K bajta)" -#: ../gcab.c:120 +#: src/gcab.c:125 msgid "FILE INPUT_FILES..." msgstr "ULAZNE_DATOTEKE DATOTEKE..." -#: ../gcab.c:134 +#: src/gcab.c:139 msgid "- create a Cabinet file" msgstr "— napravite Kabinet datoteku" -#: ../gcab.c:135 -#, c-format -msgid "Report bugs to <%s>" -msgstr "Greške prijavite na <%s>" +#: src/gcab.c:140 +#| msgid "Report bugs to <%s>" +msgid "Report bugs to:" +msgstr "Greške prijavite na:" -#: ../gcab.c:138 +#: src/gcab.c:142 msgid "" "gcab saves many files together into a cabinet archive, and can restore\n" "individual files from the archive." @@ -104,72 +94,82 @@ "gkab čuva zajedno mnogo datoteka u kabinet arhivi, i može da vrati\n" "pojedinačne datoteke iz arhive." -#: ../gcab.c:145 -#, c-format -msgid "option parsing failed: %s\n" -msgstr "nije uspela obrada opcije: %s\n" - -#: ../gcab.c:154 -msgid "Please specify a single operation." -msgstr "Molim navedite jednu radnju." - -#: ../gcab.c:157 -msgid "cabinet file must be specified." -msgstr "mora biti navedena kabinet datoteka." - -#: ../gcab.c:171 -#, c-format -msgid "can't open %s for reading: %s\n" -msgstr "ne mogu da otvorim „%s“ za čitanje: %s\n" - -#: ../gcab.c:173 -#, c-format -msgid "error reading %s: %s\n" -msgstr "greška čitanja „%s“: %s\n" - -#: ../gcab.c:208 -#, c-format -msgid "error during extraction: %s" -msgstr "greška prilikom izvlačenja: %s" - -#: ../gcab.c:220 -#, c-format -msgid "error while reading signature: %s" -msgstr "greška prilikom čitanja potpisa: %s" - -#: ../gcab.c:231 -msgid "please specify input files." -msgstr "molim navedite ulazne datoteke." - -#: ../gcab.c:249 -#, c-format -msgid "Can't add file %s: %s" -msgstr "Ne mogu da dodam datoteku „%s“: %s" - -#: ../gcab.c:259 -msgid "no files to be archived." -msgstr "nema datoteka za arhiviranje." - -#: ../gcab.c:265 -#, c-format -msgid "can't create cab file %s: %s" -msgstr "ne mogu da napravim kab datoteku „%s“: %s" - -#: ../gcab.c:269 -#, c-format -msgid "can't add folder to cab file %s: %s" -msgstr "ne mogu da dodam fasciklu u kab datoteku„%s“: %s" - -#: ../gcab.c:277 -#, c-format -msgid "can't write cab file %s: %s" -msgstr "ne mogu da zapišem kab datoteku „%s“: %s" - -#: ../libgcab/cabinet.c:20 ../libgcab/cabinet.c:468 -#, c-format -msgid "unsupported compression method %d" -msgstr "nepodržan režim pakovanja „%d“" - -#: ../libgcab/cabinet.c:482 -msgid "incorrect checksum detected" -msgstr "otkrivena je neispravna suma provere" +#: src/gcab.c:149 +#| msgid "option parsing failed: %s\n" +msgid "Option parsing failed" +msgstr "Nije uspela obrada opcije" + +#: src/gcab.c:159 +#| msgid "Please specify a single operation." +msgid "Please specify a single operation" +msgstr "Navedite jednu radnju" + +#: src/gcab.c:164 +#| msgid "cabinet file must be specified." +msgid "Cabinet file must be specified" +msgstr "Mora biti navedena kabinet datoteka" + +#: src/gcab.c:180 +#| msgid "can't open %s for reading: %s\n" +msgid "Cannot open file for reading" +msgstr "Ne mogu da otvorim datoteku za čitanje" + +#: src/gcab.c:184 +#| msgid "error reading %s: %s\n" +msgid "Error reading" +msgstr "Greška čitanja" + +#: src/gcab.c:220 +#| msgid "error during extraction: %s" +msgid "Error during extraction" +msgstr "Greška prilikom izvlačenja" + +#: src/gcab.c:235 +#| msgid "error while reading signature: %s" +msgid "Error while reading signature" +msgstr "Greška prilikom čitanja potpisa" + +#: src/gcab.c:247 +#| msgid "cabinet file must be specified." +msgid "No input files specified" +msgstr "Nisu navedene ulazne datoteke" + +#: src/gcab.c:266 +#| msgid "Can't add file %s: %s" +msgid "Cannot add file" +msgstr "Ne mogu da dodam datoteku" + +#: src/gcab.c:272 +#| msgid "no files to be archived." +msgid "No files to be archived" +msgstr "Nema datoteka za arhiviranje" + +#: src/gcab.c:280 +#| msgid "can't create cab file %s: %s" +msgid "Cannot create cab file" +msgstr "Ne mogu da napravim kab datoteku" + +#: src/gcab.c:286 +#| msgid "can't add folder to cab file %s: %s" +msgid "Cannot add folder to cab file" +msgstr "Ne mogu da dodam fasciklu u kab datoteku" + +#: src/gcab.c:296 +#| msgid "can't write cab file %s: %s" +msgid "Cannot write cab file" +msgstr "Ne mogu da zapišem kab datoteku" + +#~ msgid "Removing leading '%s' from member names" +#~ msgstr "Uklanjam vodeće „%s“ iz naziva članova" + +#~ msgid "can't write file %s: %s" +#~ msgstr "ne mogu da zapišem datoteku „%s“: %s" + +#~ msgid "please specify input files." +#~ msgstr "molim navedite ulazne datoteke." + +#~ msgid "unsupported compression method %d" +#~ msgstr "nepodržan režim pakovanja „%d“" + +#~ msgid "incorrect checksum detected" +#~ msgstr "otkrivena je neispravna suma provere"
