summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-31 23:31:03 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-31 23:31:03 +0000
commitb5be8bfc6330e6bf162a520ef12583c1f6904450 (patch)
tree7ef8c3b2a241c34eb6439a758127b9219354e68f
parentd76aab988d5af06bab7e2ac4c43b5952cc2e377b (diff)
downloadurpmi-b5be8bfc6330e6bf162a520ef12583c1f6904450.tar
urpmi-b5be8bfc6330e6bf162a520ef12583c1f6904450.tar.gz
urpmi-b5be8bfc6330e6bf162a520ef12583c1f6904450.tar.bz2
urpmi-b5be8bfc6330e6bf162a520ef12583c1f6904450.tar.xz
urpmi-b5be8bfc6330e6bf162a520ef12583c1f6904450.zip
factorize Copyright string
rationale: - easier to maintain in the long term - help syncing translations
-rw-r--r--gurpmi.pm5
-rwxr-xr-xurpme8
-rwxr-xr-xurpmf8
-rwxr-xr-xurpmi8
-rw-r--r--urpmi.recover6
-rwxr-xr-xurpmq8
6 files changed, 27 insertions, 16 deletions
diff --git a/gurpmi.pm b/gurpmi.pm
index 6c002812..e32b8e62 100644
--- a/gurpmi.pm
+++ b/gurpmi.pm
@@ -37,11 +37,12 @@ urpm::select::add_packages_to_priority_upgrade_list('gurpmi', 'perl-Glib', 'perl
sub usage () {
print N("urpmi version %s
-Copyright (C) 1999-2010 Mandriva.
+%s
This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-", $urpm::VERSION) . " gurpmi <rpm> [ <rpm>... ]
+", $urpm::VERSION, N("Copyright (C) %s by %s", "1999-2010", "Mandriva")
+ ) . " gurpmi <rpm> [ <rpm>... ]
" . N("Options:") . "\n"
. N(" --help - print this help message.
") . N(" --auto - non-interactive mode, assume default answers to questions.
diff --git a/urpme b/urpme
index 29e29737..a806921c 100755
--- a/urpme
+++ b/urpme
@@ -39,12 +39,14 @@ my $yesexpr =
sub usage() {
print N("urpme version %s
-Copyright (C) 1999-2010 Mandriva.
-Copyright (C) 2012 Mageia.
+%s
This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-", $urpm::VERSION) . N(" --help - print this help message.
+", $urpm::VERSION,
+ N("Copyright (C) %s by %s", "1999-2010", "Mandriva") .
+ N("Copyright (C) %s by %s", "2012", "Mageia")
+ ) . N(" --help - print this help message.
") . N(" --auto - automatically select a package in choices.
") . N(" --auto-orphans - remove orphans
") . N(" --test - verify if the removal can be achieved correctly.
diff --git a/urpmf b/urpmf
index e9f348b7..a6b6ab37 100755
--- a/urpmf
+++ b/urpmf
@@ -27,12 +27,14 @@ use urpm::media;
sub usage() {
print N("urpmf version %s
-Copyright (C) 2002-2010 Mandriva.
-Copyright (C) 2012 Mageia.
+%s
This is free software and may be redistributed under the terms of the GNU GPL.
usage: urpmf [options] pattern-expression
-", $urpm::VERSION)
+", $urpm::VERSION,
+ N("Copyright (C) %s by %s", "2002-2010", "Mandriva") .
+ N("Copyright (C) %s by %s", "2012", "Mageia")
+ )
. N(" --help - print this help message.
") . N(" --version - print this tool's version number.
") . N(" --env - use specific environment (typically a bug report).
diff --git a/urpmi b/urpmi
index 46516787..9fbbb013 100755
--- a/urpmi
+++ b/urpmi
@@ -64,12 +64,14 @@ $ENV{USER} ||= "root";
sub usage () {
print N("urpmi version %s
-Copyright (C) 1999-2010 Mandriva.
-Copyright (C) 2011-2012 Mageia.
+%s
This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-", $urpm::VERSION) . N(" --help - print this help message.
+", $urpm::VERSION,
+ N("Copyright (C) %s by %s", "1999-2010", "Mandriva") .
+ N("Copyright (C) %s by %s", "2011-2012", "Mageia")
+ ) . N(" --help - print this help message.
") . N(" --media - use only the given media, separated by comma.
") . N(" --excludemedia - do not use the given media, separated by comma.
") . N(" --update - use only update media.
diff --git a/urpmi.recover b/urpmi.recover
index 8f806838..dc7e4dae 100644
--- a/urpmi.recover
+++ b/urpmi.recover
@@ -26,11 +26,13 @@ our $disable;
sub usage () {
print N("urpmi.recover version %s
-Copyright (C) 2006-2010 Mandriva.
+%s
This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-", $urpm::VERSION) . N(" --help - print this help message.
+", $urpm::VERSION,
+ N("Copyright (C) %s by %s", "2006-2010", "Mandriva")
+ ) . N(" --help - print this help message.
") . N(" --checkpoint - set repackaging start now
") . N(" --noclean - don't clean repackage directory on checkpoint
") . N(" --urpmi-root - use another root for urpmi db & rpm installation.
diff --git a/urpmq b/urpmq
index b2ff3545..e6bb1083 100755
--- a/urpmq
+++ b/urpmq
@@ -38,12 +38,14 @@ our @src_names;
sub usage() {
print N("urpmq version %s
-Copyright (C) 2000-2010 Mandriva.
-Copyright (C) 2012 Mageia.
+%s
This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-", $urpm::VERSION) . N(" --help - print this help message.
+", $urpm::VERSION,
+ N("Copyright (C) %s by %s", '2000-2010', 'Mandriva') .
+ N("Copyright (C) %s by %s", '2012', 'Mandriva')
+ ) . N(" --help - print this help message.
") . N(" --update - use only update media.
") . N(" --media - use only the given media, separated by comma.
") . N(" --searchmedia - use only the given media to search requested (or updated) packages.