small changes to translatable strings, to avoid duplication

and to reuse existing translations when possible

3 files changed, 23 insertions, 25 deletions

diff --git a/urpmf b/urpmf
index 396a0256..8ef70ca2 100755
--- a/urpmf
+++ b/urpmf
@@ -30,26 +30,26 @@ This is free software and may be redistributed under the terms of the GNU GPL.
 
 usage: urpmf [options] pattern-expression
 ", $urpm::VERSION)
-   . N("  --help         - print this help message
-") . N("  --version      - print this tool's version number
-") . N("  --env          - use specific environment (typically a bug report)
-") . N("  --excludemedia - do not use the given media, separated by comma
-") . N("  --literal, -l  - don't match patterns, use argument as a literal string
-") . N("  --media        - use only the given media, separated by comma
-") . N("  --sortmedia    - sort media according to substrings separated by comma
-") . N("  --synthesis    - use this synthesis instead of urpmi db
-") . N("  --uniq         - do not print identical lines twice
-") . N("  --update       - use only update media
-") . N("  --verbose      - verbose mode
-") . N("  -i             - ignore case distinctions in patterns
-") . N("  -F<str>        - change field separator (defaults to ':')
+   . N("  --help         - print this help message.
+") . N("  --version      - print this tool's version number.
+") . N("  --env          - use specific environment (typically a bug report).
+") . N("  --excludemedia - do not use the given media, separated by comma.
+") . N("  --literal, -l  - don't match patterns, use argument as a literal string.
+") . N("  --media        - use only the given media, separated by comma.
+") . N("  --sortmedia    - sort media according to substrings separated by comma.
+") . N("  --synthesis    - use the given synthesis instead of urpmi db.
+") . N("  --uniq         - do not print identical lines twice.
+") . N("  --update       - use only update media.
+") . N("  --verbose      - verbose mode.
+") . N("  -i             - ignore case distinctions in patterns.
+") . N("  -F<str>        - change field separator (defaults to ':').
 ") . N("Pattern expressions:
-") . N("  text		 - any text is parsed as a regexp, unless -l is used
-") . N("  -e             - include perl code directly as perl -e
-") . N("  -a             - binary AND operator
-") . N("  -o             - binary OR operator
-") . N("  !              - unary NOT
-") . N("  ( )            - left and right parentheses
+") . N("  text           - any text is parsed as a regexp, unless -l is used.
+") . N("  -e             - include perl code directly as perl -e.
+") . N("  -a             - binary AND operator.
+") . N("  -o             - binary OR operator.
+") . N("  !              - unary NOT.
+") . N("  ( )            - left and right parentheses.
 ") . N("List of tags:
 ") . N("  --qf           - specify a printf-like output format
 ") . N("                   example: '%%name:%%files'
@@ -75,7 +75,7 @@ usage: urpmf [options] pattern-expression
 ") . N("  --url          - url
 ") . N("  --vendor       - vendor
 ") . N("  -m             - the media in which the package was found
-") . N("  -f             - print version, release and arch with name
+") . N("  -f             - print version, release and arch with name.
 ");
     exit(0);
 }
diff --git a/urpmi b/urpmi
index f557db56..df2c985b 100755
--- a/urpmi
+++ b/urpmi
@@ -118,8 +118,7 @@ usage:
                    authentication (format is <user:password>).
 ") . N("  --bug          - output a bug report in directory indicated by
                    next arg.
-") . N("  --env          - use specific environment (typically a bug
-                   report).
+") . N("  --env          - use specific environment (typically a bug report).
 ") . N("  --verify-rpm   - verify rpm signature before installation
                    (--no-verify-rpm disable it, default is enabled).
 ") . N("  --test         - verify if the installation can be achieved correctly.
diff --git a/urpmq b/urpmq
index eb9aa92d..77a5010e 100755
--- a/urpmq
+++ b/urpmq
@@ -46,7 +46,7 @@ usage:
 ") . N("  --searchmedia  - use only the given media to search requested (or updated) packages.
 ") . N("  --excludemedia - do not use the given media, separated by comma.
 ") . N("  --sortmedia    - sort media according to substrings separated by comma.
-") . N("  --synthesis    - use the synthesis given instead of urpmi db.
+") . N("  --synthesis    - use the given synthesis instead of urpmi db.
 ") . N("  --auto-select  - automatically select packages to upgrade the system.
 ") . N("  --fuzzy        - impose fuzzy search (same as -y).
 ") . N("  --keep         - keep existing packages if possible, reject requested
@@ -71,8 +71,7 @@ usage:
                    to be 1080 by default (format is <proxyhost[:port]>).
 ") . N("  --proxy-user   - specify user and password to use for proxy
                    authentication (format is <user:password>).
-") . N("  --env          - use specific environment (typically a bug
-                   report).
+") . N("  --env          - use specific environment (typically a bug report).
 ") . N("  --changelog    - print changelog.
 ") . N("  --summary, -S  - print summary.
 ") . N("  -a             - select all matches on command line.