From: Kern Sibbald Date: Tue, 7 Feb 2017 14:07:45 +0000 (+0100) Subject: Final tweaks for release 7.4.5 X-Git-Tag: Release-7.4.5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dc8ea842bfa358f5c0c9a2ef30ff97f0375a30e0;p=bacula%2Fbacula Final tweaks for release 7.4.5 --- diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 12d6cade95..352e9ffe00 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,4 +1,38 @@ - Changelog on version 7.4.4 + Changelog on version 7.4.5 + +Release version 7.4.5 + +07Feb17 + - Correct wrong word in message + +28Jan17 + - Remove restriction on using the scratch pool that can cause restore failures + - Remove debug code that breaks btape fill + +25Dec16 + - Initialize freespace_mutex fixes bug 2207 + +11Dec16 + - baculum: Update AUTHORS file + +08Dec16 + - baculum: Enable Japanese language on web interface + - baculum: Implement Japanese language support + +19Nov16 + - XACL - refactoring an ACL and XATTR codes. + - Revert "Warn of Storage Daemon version incompatibility if label fails. Bug + #2193" + +02Oct16 + - Make another attempt to resolve bug #2176 + - Warn of Storage Daemon version incompatibility if label fails. Bug #2193 + - Apply patch to list more pool info from bug #2202 + +21Sep16 + - Fix status alignment output reported by Wanderlei Huttel + +========================================================================== Release version 7.4.4 diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index cb5437af9a..14452db403 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -1,5 +1,28 @@ - Release Notes for Bacula 7.4.4 + Release Notes for Bacula 7.4.5 + +This is a minor bug fix plus a significant total rewrite of the +ACL and XATTR code by Radoslaw Korzeniewski. + +07Feb17 + - Correct wrong word in message + - Remove restriction on using the scratch pool that can + cause restore failures + - Remove debug code that breaks btape fill + - Initialize freespace_mutex fixes bug 2207 + - baculum: Update AUTHORS file + - baculum: Enable Japanese language on web interface + - baculum: Implement Japanese language support + - XACL - refactoring an ACL and XATTR codes. + - Revert "Warn of Storage Daemon version incompatibility if + label fails. Bug #2193" + - Make another attempt to resolve bug #2176 + - Warn of Storage Daemon version incompatibility if label fails. Bug #2193 + - Apply patch to list more pool info from bug #2202 + - Fix status alignment output reported by Wanderlei Huttel + + +===================================================== Release version 7.4.4 @@ -37,7 +60,6 @@ Bugs fixed/closed since last release: 1968 2060 2085 2222 2237 335 -===================================================== Release version 7.4.3 diff --git a/bacula/po/POTFILES.in b/bacula/po/POTFILES.in index a605cec689..3580d426ce 100644 --- a/bacula/po/POTFILES.in +++ b/bacula/po/POTFILES.in @@ -2,6 +2,7 @@ # To generate this file, type 'make gen-potfiles' autoconf/acconfig.h autoconf/confdefs.h +examples/nagios/check_bacula/check_bacula.h src/baconfig.h src/bacula.h src/bc_types.h @@ -24,7 +25,6 @@ src/dird/dird_conf.h src/dird/jobq.h src/dird/protos.h src/dird/ua.h -src/filed/acl.h src/filed/backup.h src/filed/fd_plugins.h src/filed/fd_snapshot.h @@ -32,7 +32,11 @@ src/filed/filed.h src/filed/filed_conf.h src/filed/protos.h src/filed/restore.h -src/filed/xattr.h +src/filed/xacl.h +src/filed/xacl_freebsd.h +src/filed/xacl_linux.h +src/filed/xacl_osx.h +src/filed/xacl_solaris.h src/fileopts.h src/filetypes.h src/findlib/bfile.h diff --git a/bacula/po/bacula.pot b/bacula/po/bacula.pot index 2dcc06baae..ab2dd3db53 100644 --- a/bacula/po/bacula.pot +++ b/bacula/po/bacula.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-01-10 15:13+0100\n" +"POT-Creation-Date: 2017-02-07 15:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,57 +34,57 @@ msgid "" msgstr "" #: src/lib/status.h:84 -msgid " JobId Level Files Bytes Status Finished Name \n" +msgid " JobId Level Files Bytes Status Finished Name \n" msgstr "" #: src/lib/status.h:86 msgid "===================================================================\n" msgstr "" -#: src/lib/status.h:106 +#: src/lib/status.h:107 msgid "Created" msgstr "" -#: src/lib/status.h:110 +#: src/lib/status.h:111 msgid "Error" msgstr "" -#: src/lib/status.h:113 +#: src/lib/status.h:114 msgid "Diffs" msgstr "" -#: src/lib/status.h:116 +#: src/lib/status.h:117 msgid "Cancel" msgstr "" -#: src/lib/status.h:119 +#: src/lib/status.h:120 msgid "OK" msgstr "" -#: src/lib/status.h:122 +#: src/lib/status.h:123 msgid "OK -- with warnings" msgstr "" -#: src/lib/status.h:125 +#: src/lib/status.h:126 msgid "Incomplete" msgstr "" -#: src/lib/status.h:128 +#: src/lib/status.h:129 msgid "Other" msgstr "" -#: src/lib/status.h:140 +#: src/lib/status.h:141 #, c-format -msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" +msgid "%6d\t%-7s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" msgstr "" -#: src/lib/status.h:148 +#: src/lib/status.h:149 #, c-format -msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" +msgid "%6d %-7s %8s %10s %-7s %-8s %s\n" msgstr "" -#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202 -#: src/lib/status.h:206 src/lib/status.h:210 +#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203 +#: src/lib/status.h:207 src/lib/status.h:211 msgid "Bacula " msgstr "" @@ -118,13 +118,14 @@ msgstr "" #: src/qt-console/bat_conf.cpp:261 #: src/qt-console/tray-monitor/tray_conf.cpp:279 #, c-format -msgid "%s item is required in %s resource, but not found.\n" +msgid "\"%s\" directive is required in \"%s\" resource, but not found.\n" msgstr "" #: src/qt-console/bat_conf.cpp:330 #: src/qt-console/tray-monitor/tray_conf.cpp:363 #, c-format -msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" +msgid "" +"Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" msgstr "" #: src/qt-console/bcomm/dircomm.cpp:88 @@ -476,7 +477,7 @@ msgstr "" #: src/qt-console/tray-monitor/tray_conf.cpp:285 #, c-format -msgid "Too many items in %s resource\n" +msgid "Too many directives in \"%s\" resource\n" msgstr "" #: src/qt-console/tray-monitor/tray_conf.cpp:305 diff --git a/bacula/po/de.po b/bacula/po/de.po index a80fd0e6e1..fa458b8f2b 100644 --- a/bacula/po/de.po +++ b/bacula/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-01-10 15:13+0100\n" +"POT-Creation-Date: 2017-02-07 15:07+0100\n" "PO-Revision-Date: 2007-06-25 20:38+0200\n" "Last-Translator: Kern Sibbald \n" "Language-Team: \n" @@ -34,58 +34,58 @@ msgid "" msgstr "" #: src/lib/status.h:84 -msgid " JobId Level Files Bytes Status Finished Name \n" +msgid " JobId Level Files Bytes Status Finished Name \n" msgstr "" #: src/lib/status.h:86 msgid "===================================================================\n" msgstr "" -#: src/lib/status.h:106 +#: src/lib/status.h:107 msgid "Created" msgstr "" -#: src/lib/status.h:110 +#: src/lib/status.h:111 msgid "Error" msgstr "" -#: src/lib/status.h:113 +#: src/lib/status.h:114 msgid "Diffs" msgstr "" -#: src/lib/status.h:116 +#: src/lib/status.h:117 msgid "Cancel" msgstr "" -#: src/lib/status.h:119 +#: src/lib/status.h:120 msgid "OK" msgstr "" -#: src/lib/status.h:122 +#: src/lib/status.h:123 #, fuzzy msgid "OK -- with warnings" msgstr "%s OK -- mit Warnungen" -#: src/lib/status.h:125 +#: src/lib/status.h:126 msgid "Incomplete" msgstr "" -#: src/lib/status.h:128 +#: src/lib/status.h:129 msgid "Other" msgstr "" -#: src/lib/status.h:140 -#, c-format -msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" -msgstr "" +#: src/lib/status.h:141 +#, fuzzy, c-format +msgid "%6d\t%-7s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" +msgstr "1000 OK: %s Version: %s (%s)\n" -#: src/lib/status.h:148 -#, c-format -msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" -msgstr "" +#: src/lib/status.h:149 +#, fuzzy, c-format +msgid "%6d %-7s %8s %10s %-7s %-8s %s\n" +msgstr "1000 OK: %s Version: %s (%s)\n" -#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202 -#: src/lib/status.h:206 src/lib/status.h:210 +#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203 +#: src/lib/status.h:207 src/lib/status.h:211 msgid "Bacula " msgstr "Bacula " @@ -118,14 +118,15 @@ msgstr "" #: src/qt-console/bat_conf.cpp:261 #: src/qt-console/tray-monitor/tray_conf.cpp:279 -#, c-format -msgid "%s item is required in %s resource, but not found.\n" +#, fuzzy, c-format +msgid "\"%s\" directive is required in \"%s\" resource, but not found.\n" msgstr "%s item wird in %s resource benötigt, wurde aber nicht gefunden.\n" #: src/qt-console/bat_conf.cpp:330 #: src/qt-console/tray-monitor/tray_conf.cpp:363 -#, c-format -msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" +#, fuzzy, c-format +msgid "" +"Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" msgstr "" "Der Versuch der Definition einer zweiten %s resource mit dem Namen \"%s\" " "ist nicht erlaubt.\n" @@ -527,8 +528,8 @@ msgid "Unknown resource type %d in free_resource.\n" msgstr "Unbekannter resource type %d in free_resource.\n" #: src/qt-console/tray-monitor/tray_conf.cpp:285 -#, c-format -msgid "Too many items in %s resource\n" +#, fuzzy, c-format +msgid "Too many directives in \"%s\" resource\n" msgstr "zu viele items in %s resource\n" #: src/qt-console/tray-monitor/tray_conf.cpp:305 @@ -2926,10 +2927,6 @@ msgstr "Unbekannter resource type %d in save_resource.\n" #~ msgid "is waiting for Client to connect to Storage daemon" #~ msgstr "Verbindung zu Storage daemon fehlgeschlagen.\n" -#, fuzzy -#~ msgid "%6d %-4s %-3s %10s %10s %-17s %s\n" -#~ msgstr "1000 OK: %s Version: %s (%s)\n" - #, fuzzy #~ msgid "Invalid command \"%s\". Enter \"done\" to exit.\n" #~ msgstr "unbekannt" diff --git a/bacula/po/es.po b/bacula/po/es.po index d8a28ac185..6e0450a66b 100644 --- a/bacula/po/es.po +++ b/bacula/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 3.0.2\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-01-10 15:13+0100\n" +"POT-Creation-Date: 2017-02-07 15:07+0100\n" "PO-Revision-Date: 2009-12-01 16:04-0300\n" "Last-Translator: Victor Hugo dos Santos \n" "Language-Team: Bacula Spanish Team \n" @@ -38,57 +38,58 @@ msgstr "" "Jobs No Terminados:\n" #: src/lib/status.h:84 -msgid " JobId Level Files Bytes Status Finished Name \n" +#, fuzzy +msgid " JobId Level Files Bytes Status Finished Name \n" msgstr "JobId Nivel Archivos Bytes Estado Finalizado Nombre \n" #: src/lib/status.h:86 msgid "===================================================================\n" msgstr "===================================================================\n" -#: src/lib/status.h:106 +#: src/lib/status.h:107 msgid "Created" msgstr "Creado" -#: src/lib/status.h:110 +#: src/lib/status.h:111 msgid "Error" msgstr "Error" -#: src/lib/status.h:113 +#: src/lib/status.h:114 msgid "Diffs" msgstr "Diferencias" -#: src/lib/status.h:116 +#: src/lib/status.h:117 msgid "Cancel" msgstr "Cancelar" -#: src/lib/status.h:119 +#: src/lib/status.h:120 msgid "OK" msgstr "OK" -#: src/lib/status.h:122 +#: src/lib/status.h:123 msgid "OK -- with warnings" msgstr "OK - con advertencias" -#: src/lib/status.h:125 +#: src/lib/status.h:126 msgid "Incomplete" msgstr "" -#: src/lib/status.h:128 +#: src/lib/status.h:129 msgid "Other" msgstr "Otros" -#: src/lib/status.h:140 -#, c-format -msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" +#: src/lib/status.h:141 +#, fuzzy, c-format +msgid "%6d\t%-7s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" msgstr "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" -#: src/lib/status.h:148 -#, c-format -msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" +#: src/lib/status.h:149 +#, fuzzy, c-format +msgid "%6d %-7s %8s %10s %-7s %-8s %s\n" msgstr "%6d %-6s %8s %10s %-7s %-8s %s\n" -#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202 -#: src/lib/status.h:206 src/lib/status.h:210 +#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203 +#: src/lib/status.h:207 src/lib/status.h:211 msgid "Bacula " msgstr "Bacula" @@ -121,16 +122,18 @@ msgstr "Tipo de recurso desconocido %d\n" #: src/qt-console/bat_conf.cpp:261 #: src/qt-console/tray-monitor/tray_conf.cpp:279 -#, c-format -msgid "%s item is required in %s resource, but not found.\n" -msgstr "Ítem %s es necesario en recurso %s, pero no se encuentra.\n" +#, fuzzy, c-format +msgid "\"%s\" directive is required in \"%s\" resource, but not found.\n" +msgstr "ítem \"%s\" es necesario en recurso \"%s\", pero no se encuentra.\n" #: src/qt-console/bat_conf.cpp:330 #: src/qt-console/tray-monitor/tray_conf.cpp:363 #, c-format -msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" +msgid "" +"Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" msgstr "" -"Segundo intento de definir recurso %s llamado \"%s\" no está permitido.\n" +"Intento para definir secundo recurso \"%s\" denominado \"%s\" no está " +"permitido.\n" #: src/qt-console/bcomm/dircomm.cpp:88 #, c-format @@ -538,9 +541,9 @@ msgid "Unknown resource type %d in free_resource.\n" msgstr "Tipo de recurso desconocido %d en free_resource.\n" #: src/qt-console/tray-monitor/tray_conf.cpp:285 -#, c-format -msgid "Too many items in %s resource\n" -msgstr "Demasiados ítem en recurso %s\n" +#, fuzzy, c-format +msgid "Too many directives in \"%s\" resource\n" +msgstr "Demasiados elementos en recursos \"%s\"\n" #: src/qt-console/tray-monitor/tray_conf.cpp:305 #: src/qt-console/tray-monitor/tray_conf.cpp:343 @@ -548,6 +551,17 @@ msgstr "Demasiados ítem en recurso %s\n" msgid "Unknown resource type %d in save_resource.\n" msgstr "Tipo de recurso desconocido %d en save_resource.\n" +#~ msgid "%s item is required in %s resource, but not found.\n" +#~ msgstr "Ítem %s es necesario en recurso %s, pero no se encuentra.\n" + +#~ msgid "" +#~ "Attempt to define second %s resource named \"%s\" is not permitted.\n" +#~ msgstr "" +#~ "Segundo intento de definir recurso %s llamado \"%s\" no está permitido.\n" + +#~ msgid "Too many items in %s resource\n" +#~ msgstr "Demasiados ítem en recurso %s\n" + #~ msgid "Query failed: %s: ERR=%s\n" #~ msgstr "Consulta fallida: %s: ERR=%s\n" @@ -13640,12 +13654,6 @@ msgstr "Tipo de recurso desconocido %d en save_resource.\n" #~ msgid "Warning: unknown resource type %d\n" #~ msgstr "Advertencia: Tipo de recurso %d desconocido\n" -#~ msgid "\"%s\" item is required in \"%s\" resource, but not found.\n" -#~ msgstr "ítem \"%s\" es necesario en recurso \"%s\", pero no se encuentra.\n" - -#~ msgid "Too many items in \"%s\" resource\n" -#~ msgstr "Demasiados elementos en recursos \"%s\"\n" - #~ msgid "Cannot find AutoChanger resource %s\n" #~ msgstr "No puede encontrar recurso Auto-cambiador %s\n" @@ -15865,12 +15873,6 @@ msgstr "Tipo de recurso desconocido %d en save_resource.\n" #~ msgid "Append data error.\n" #~ msgstr "Error al añadir datos.\n" -#~ msgid "" -#~ "Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" -#~ msgstr "" -#~ "Intento para definir secundo recurso \"%s\" denominado \"%s\" no está " -#~ "permitido.\n" - #, fuzzy #~ msgid "Attempt to set StorageId to zero.\n" #~ msgstr "Intento de abrir sesión ya abierta.\n" diff --git a/bacula/po/fr.po b/bacula/po/fr.po index 5e033a7b77..4c8ded1b08 100644 --- a/bacula/po/fr.po +++ b/bacula/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 1.38\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-01-10 15:13+0100\n" +"POT-Creation-Date: 2017-02-07 15:07+0100\n" "PO-Revision-Date: 2009-10-18 14:04+0000\n" "Last-Translator: Eric Bollengier \n" "Language-Team: French \n" @@ -37,57 +37,58 @@ msgstr "" "Job terminés :\n" #: src/lib/status.h:84 -msgid " JobId Level Files Bytes Status Finished Name \n" +#, fuzzy +msgid " JobId Level Files Bytes Status Finished Name \n" msgstr " JobId Type Fichiers Octets Statut Terminé Nom\n" #: src/lib/status.h:86 msgid "===================================================================\n" msgstr "===================================================================\n" -#: src/lib/status.h:106 +#: src/lib/status.h:107 msgid "Created" msgstr "Crée" -#: src/lib/status.h:110 +#: src/lib/status.h:111 msgid "Error" msgstr "Erreur" -#: src/lib/status.h:113 +#: src/lib/status.h:114 msgid "Diffs" msgstr "" -#: src/lib/status.h:116 +#: src/lib/status.h:117 msgid "Cancel" msgstr "Annulé" -#: src/lib/status.h:119 +#: src/lib/status.h:120 msgid "OK" msgstr "OK" -#: src/lib/status.h:122 +#: src/lib/status.h:123 msgid "OK -- with warnings" msgstr "OK -- avec des avertissements" -#: src/lib/status.h:125 +#: src/lib/status.h:126 msgid "Incomplete" msgstr "" -#: src/lib/status.h:128 +#: src/lib/status.h:129 msgid "Other" msgstr "Autre" -#: src/lib/status.h:140 +#: src/lib/status.h:141 #, fuzzy, c-format -msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" +msgid "%6d\t%-7s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" msgstr "%6d %-6s %8s %10s %-7s %-8s %s\n" -#: src/lib/status.h:148 -#, c-format -msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" +#: src/lib/status.h:149 +#, fuzzy, c-format +msgid "%6d %-7s %8s %10s %-7s %-8s %s\n" msgstr "%6d %-6s %8s %10s %-7s %-8s %s\n" -#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202 -#: src/lib/status.h:206 src/lib/status.h:210 +#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203 +#: src/lib/status.h:207 src/lib/status.h:211 msgid "Bacula " msgstr "Bacula " @@ -121,13 +122,14 @@ msgstr "" #: src/qt-console/bat_conf.cpp:261 #: src/qt-console/tray-monitor/tray_conf.cpp:279 #, c-format -msgid "%s item is required in %s resource, but not found.\n" +msgid "\"%s\" directive is required in \"%s\" resource, but not found.\n" msgstr "" #: src/qt-console/bat_conf.cpp:330 #: src/qt-console/tray-monitor/tray_conf.cpp:363 #, c-format -msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" +msgid "" +"Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" msgstr "" #: src/qt-console/bcomm/dircomm.cpp:88 @@ -525,9 +527,9 @@ msgid "Unknown resource type %d in free_resource.\n" msgstr "" #: src/qt-console/tray-monitor/tray_conf.cpp:285 -#, c-format -msgid "Too many items in %s resource\n" -msgstr "Trop d'élément dans la ressource %s\n" +#, fuzzy, c-format +msgid "Too many directives in \"%s\" resource\n" +msgstr "Trop d'éléments dans la ressource \"%s\"\n" #: src/qt-console/tray-monitor/tray_conf.cpp:305 #: src/qt-console/tray-monitor/tray_conf.cpp:343 @@ -535,6 +537,9 @@ msgstr "Trop d'élément dans la ressource %s\n" msgid "Unknown resource type %d in save_resource.\n" msgstr "" +#~ msgid "Too many items in %s resource\n" +#~ msgstr "Trop d'élément dans la ressource %s\n" + #~ msgid "A user name for MySQL must be supplied.\n" #~ msgstr "Un nom d'utilisateur MySQL doit être fourni.\n" @@ -8155,9 +8160,6 @@ msgstr "" #~ msgid "Could not mount device %s\n" #~ msgstr "Impossible de monter le device %s\n" -#~ msgid "Too many items in \"%s\" resource\n" -#~ msgstr "Trop d'éléments dans la ressource \"%s\"\n" - #~ msgid "Cannot find AutoChanger resource %s\n" #~ msgstr "Impossible de trouver la ressource AutoChanger %s\n" diff --git a/bacula/po/nl.po b/bacula/po/nl.po index d159354b01..a2dfdf38cc 100644 --- a/bacula/po/nl.po +++ b/bacula/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 5.2.7\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-01-10 15:13+0100\n" +"POT-Creation-Date: 2017-02-07 15:07+0100\n" "PO-Revision-Date: 2012-05-05 11:52+0100\n" "Last-Translator: W. van den Akker \n" "Language-Team: LANGUAGE \n" @@ -33,57 +33,57 @@ msgid "" msgstr "" #: src/lib/status.h:84 -msgid " JobId Level Files Bytes Status Finished Name \n" +msgid " JobId Level Files Bytes Status Finished Name \n" msgstr "" #: src/lib/status.h:86 msgid "===================================================================\n" msgstr "" -#: src/lib/status.h:106 +#: src/lib/status.h:107 msgid "Created" msgstr "" -#: src/lib/status.h:110 +#: src/lib/status.h:111 msgid "Error" msgstr "" -#: src/lib/status.h:113 +#: src/lib/status.h:114 msgid "Diffs" msgstr "" -#: src/lib/status.h:116 +#: src/lib/status.h:117 msgid "Cancel" msgstr "" -#: src/lib/status.h:119 +#: src/lib/status.h:120 msgid "OK" msgstr "" -#: src/lib/status.h:122 +#: src/lib/status.h:123 msgid "OK -- with warnings" msgstr "" -#: src/lib/status.h:125 +#: src/lib/status.h:126 msgid "Incomplete" msgstr "" -#: src/lib/status.h:128 +#: src/lib/status.h:129 msgid "Other" msgstr "" -#: src/lib/status.h:140 +#: src/lib/status.h:141 #, c-format -msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" +msgid "%6d\t%-7s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" msgstr "" -#: src/lib/status.h:148 +#: src/lib/status.h:149 #, c-format -msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" +msgid "%6d %-7s %8s %10s %-7s %-8s %s\n" msgstr "" -#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202 -#: src/lib/status.h:206 src/lib/status.h:210 +#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203 +#: src/lib/status.h:207 src/lib/status.h:211 msgid "Bacula " msgstr "" @@ -117,13 +117,14 @@ msgstr "" #: src/qt-console/bat_conf.cpp:261 #: src/qt-console/tray-monitor/tray_conf.cpp:279 #, c-format -msgid "%s item is required in %s resource, but not found.\n" +msgid "\"%s\" directive is required in \"%s\" resource, but not found.\n" msgstr "" #: src/qt-console/bat_conf.cpp:330 #: src/qt-console/tray-monitor/tray_conf.cpp:363 #, c-format -msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" +msgid "" +"Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" msgstr "" #: src/qt-console/bcomm/dircomm.cpp:88 @@ -498,7 +499,7 @@ msgstr "" #: src/qt-console/tray-monitor/tray_conf.cpp:285 #, c-format -msgid "Too many items in %s resource\n" +msgid "Too many directives in \"%s\" resource\n" msgstr "" #: src/qt-console/tray-monitor/tray_conf.cpp:305 diff --git a/bacula/po/sv.po b/bacula/po/sv.po index 7cd5283d52..0042f4fe65 100644 --- a/bacula/po/sv.po +++ b/bacula/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 2.1.x\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-01-10 15:13+0100\n" +"POT-Creation-Date: 2017-02-07 15:07+0100\n" "PO-Revision-Date: 2007-06-22 19:18+0200\n" "Last-Translator: Kern Sibbald \n" "Language-Team: Swedish \n" @@ -33,57 +33,57 @@ msgid "" msgstr "" #: src/lib/status.h:84 -msgid " JobId Level Files Bytes Status Finished Name \n" +msgid " JobId Level Files Bytes Status Finished Name \n" msgstr "" #: src/lib/status.h:86 msgid "===================================================================\n" msgstr "" -#: src/lib/status.h:106 +#: src/lib/status.h:107 msgid "Created" msgstr "" -#: src/lib/status.h:110 +#: src/lib/status.h:111 msgid "Error" msgstr "" -#: src/lib/status.h:113 +#: src/lib/status.h:114 msgid "Diffs" msgstr "" -#: src/lib/status.h:116 +#: src/lib/status.h:117 msgid "Cancel" msgstr "" -#: src/lib/status.h:119 +#: src/lib/status.h:120 msgid "OK" msgstr "" -#: src/lib/status.h:122 +#: src/lib/status.h:123 msgid "OK -- with warnings" msgstr "" -#: src/lib/status.h:125 +#: src/lib/status.h:126 msgid "Incomplete" msgstr "" -#: src/lib/status.h:128 +#: src/lib/status.h:129 msgid "Other" msgstr "" -#: src/lib/status.h:140 +#: src/lib/status.h:141 #, c-format -msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" +msgid "%6d\t%-7s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" msgstr "" -#: src/lib/status.h:148 +#: src/lib/status.h:149 #, c-format -msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" +msgid "%6d %-7s %8s %10s %-7s %-8s %s\n" msgstr "" -#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202 -#: src/lib/status.h:206 src/lib/status.h:210 +#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203 +#: src/lib/status.h:207 src/lib/status.h:211 msgid "Bacula " msgstr "" @@ -117,13 +117,14 @@ msgstr "" #: src/qt-console/bat_conf.cpp:261 #: src/qt-console/tray-monitor/tray_conf.cpp:279 #, c-format -msgid "%s item is required in %s resource, but not found.\n" +msgid "\"%s\" directive is required in \"%s\" resource, but not found.\n" msgstr "" #: src/qt-console/bat_conf.cpp:330 #: src/qt-console/tray-monitor/tray_conf.cpp:363 #, c-format -msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" +msgid "" +"Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" msgstr "" #: src/qt-console/bcomm/dircomm.cpp:88 @@ -475,7 +476,7 @@ msgstr "" #: src/qt-console/tray-monitor/tray_conf.cpp:285 #, c-format -msgid "Too many items in %s resource\n" +msgid "Too many directives in \"%s\" resource\n" msgstr "" #: src/qt-console/tray-monitor/tray_conf.cpp:305 diff --git a/bacula/po/uk.po b/bacula/po/uk.po index f6e93d006a..71da0e6a12 100644 --- a/bacula/po/uk.po +++ b/bacula/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bacula 3.0.3\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-01-10 15:13+0100\n" +"POT-Creation-Date: 2017-02-07 15:07+0100\n" "PO-Revision-Date: 2010-01-08 17:32+0300\n" "Last-Translator: Vitaliy Kosharskiy \n" "Language-Team: Ukrainian\n" @@ -36,57 +36,57 @@ msgid "" msgstr "" #: src/lib/status.h:84 -msgid " JobId Level Files Bytes Status Finished Name \n" +msgid " JobId Level Files Bytes Status Finished Name \n" msgstr "" #: src/lib/status.h:86 msgid "===================================================================\n" msgstr "" -#: src/lib/status.h:106 +#: src/lib/status.h:107 msgid "Created" msgstr "" -#: src/lib/status.h:110 +#: src/lib/status.h:111 msgid "Error" msgstr "" -#: src/lib/status.h:113 +#: src/lib/status.h:114 msgid "Diffs" msgstr "" -#: src/lib/status.h:116 +#: src/lib/status.h:117 msgid "Cancel" msgstr "" -#: src/lib/status.h:119 +#: src/lib/status.h:120 msgid "OK" msgstr "" -#: src/lib/status.h:122 +#: src/lib/status.h:123 msgid "OK -- with warnings" msgstr "" -#: src/lib/status.h:125 +#: src/lib/status.h:126 msgid "Incomplete" msgstr "" -#: src/lib/status.h:128 +#: src/lib/status.h:129 msgid "Other" msgstr "" -#: src/lib/status.h:140 +#: src/lib/status.h:141 #, c-format -msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" +msgid "%6d\t%-7s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" msgstr "" -#: src/lib/status.h:148 +#: src/lib/status.h:149 #, c-format -msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" +msgid "%6d %-7s %8s %10s %-7s %-8s %s\n" msgstr "" -#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202 -#: src/lib/status.h:206 src/lib/status.h:210 +#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203 +#: src/lib/status.h:207 src/lib/status.h:211 msgid "Bacula " msgstr "" @@ -119,14 +119,15 @@ msgstr "Невідомий тип ресурсу %d\n" #: src/qt-console/bat_conf.cpp:261 #: src/qt-console/tray-monitor/tray_conf.cpp:279 -#, c-format -msgid "%s item is required in %s resource, but not found.\n" +#, fuzzy, c-format +msgid "\"%s\" directive is required in \"%s\" resource, but not found.\n" msgstr "Не знайдено необхідний елемент %s для ресурсу %s.\n" #: src/qt-console/bat_conf.cpp:330 #: src/qt-console/tray-monitor/tray_conf.cpp:363 -#, c-format -msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" +#, fuzzy, c-format +msgid "" +"Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" msgstr "Спроба визначити другий %s ресурс із назвою \"%s\" не дозволяється.\n" #: src/qt-console/bcomm/dircomm.cpp:88 @@ -530,8 +531,8 @@ msgid "Unknown resource type %d in free_resource.\n" msgstr "Невідомий тип ресурсу %d у free_resource.\n" #: src/qt-console/tray-monitor/tray_conf.cpp:285 -#, c-format -msgid "Too many items in %s resource\n" +#, fuzzy, c-format +msgid "Too many directives in \"%s\" resource\n" msgstr "Забагато елементів у ресурсі %s\n" #: src/qt-console/tray-monitor/tray_conf.cpp:305 diff --git a/bacula/src/version.h b/bacula/src/version.h index 6969669c2f..1fe7e44b0d 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -6,8 +6,8 @@ /* Note: there can be only *one* VERSION in this file */ #define VERSION "7.4.5" -#define BDATE "28 January 2017" -#define LSMDATE "28Jan17" +#define BDATE "07 February 2017" +#define LSMDATE "07Feb17" #define RELEASE 1 /* Use ONLY in rpms */