We don't need to translate the "Copyright YEAR AUTHOR" part, no part of
it should probably be translated and it definitely shouldn't turn every
single license terms notice into a separate translation just because the
author/year is different.
Fixes FS#58452
Also consistently add a blank line after the copyright and before the
license terms.
Signed-off-by: Eli Schwartz
---
v2: Just don't translate the copyright author at all.
scripts/makepkg.sh.in | 5 +++--
scripts/pacman-db-upgrade.sh.in | 3 ++-
scripts/pacman-key.sh.in | 3 ++-
scripts/pkgdelta.sh.in | 3 ++-
scripts/repo-add.sh.in | 3 ++-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 89a31148..1a7805f2 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1206,9 +1206,10 @@ usage() {
version() {
printf "makepkg (pacman) %s\n" "$makepkg_version"
+ printf -- "Copyright (c) 2006-2018 Pacman Development Team .\n"
+ printf -- "Copyright (C) 2002-2006 Judd Vinet .\n"
+ printf '\n'
printf -- "$(gettext "\
-Copyright (c) 2006-2018 Pacman Development Team .\n\
-Copyright (C) 2002-2006 Judd Vinet .\n\n\
This is free software; see the source for copying conditions.\n\
There is NO WARRANTY, to the extent permitted by law.\n")"
}
diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in
index e9e995bd..3945695c 100644
--- a/scripts/pacman-db-upgrade.sh.in
+++ b/scripts/pacman-db-upgrade.sh.in
@@ -54,8 +54,9 @@ usage() {
version() {
printf "pacman-db-upgrade (pacman) %s\n" "$myver"
+ printf -- "Copyright (c) 2010-2018 Pacman Development Team .\n"
+ printf '\n'
printf -- "$(gettext "\
-Copyright (c) 2010-2018 Pacman Development Team .\n\
This is free software; see the source for copying conditions.\n\
There is NO WARRANTY, to the extent permitted by law.\n")"
}
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index bfa5c82c..1d26f44c 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -92,8 +92,9 @@ usage() {
version() {
printf "pacman-key (pacman) %s\n" "${myver}"
+ printf -- "Copyright (c) 2010-2018 Pacman Development Team .\n"
+ printf '\n'
printf -- "$(gettext "\
-Copyright (c) 2010-2018 Pacman Development Team .\n\
This is free software; see the source for copying conditions.\n\
There is NO WARRANTY, to the extent permitted by law.\n")"
}
diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in
index f9b108da..ae88d1bf 100644
--- a/scripts/pkgdelta.sh.in
+++ b/scripts/pkgdelta.sh.in
@@ -70,8 +70,9 @@ This delta file can then be added to a database using repo-add.\n")"
version() {
printf "pkgdelta (pacman) %s\n" "$myver"
+ printf -- "Copyright (c) 2009 Xavier Chantry .\n"
+ printf '\n'
printf -- "$(gettext "\
-Copyright (c) 2009 Xavier Chantry .\n\n\
This is free software; see the source for copying conditions.\n\
There is NO WARRANTY, to the extent permitted by law.\n")"
}
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 1a837c45..506d524b 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -93,8 +93,9 @@ See %s(8) for more details and descriptions of the available options.\n")" $cmd
version() {
cmd=${0##*/}
printf "%s (pacman) %s\n\n" "$cmd" "$myver"
+ printf -- "Copyright (c) 2006-2018 Pacman Development Team .\n"
+ printf '\n'
printf -- "$(gettext "\
-Copyright (c) 2006-2018 Pacman Development Team \n\n\
This is free software; see the source for copying conditions.\n\
There is NO WARRANTY, to the extent permitted by law.\n")"
}
--
2.19.0