summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Woodward2005-01-28 18:31:55 +0000
committerJason Woodward2005-01-28 18:31:55 +0000
commitbe1c4c3738439ed858de711d99c36a15d4027488 (patch)
tree945ace79f22b888f2e0cc662765bc55ce43612a8 /src
parent57c060424a76357ea83e10ce391740967ae7f59f (diff)
downloadslapt-get-be1c4c3738439ed858de711d99c36a15d4027488.tar.gz
change 'M' and 'K' to "MB" and "kB"
Diffstat (limited to 'src')
-rw-r--r--src/curl.c8
-rw-r--r--src/transaction.c18
2 files changed, 13 insertions, 13 deletions
diff --git a/src/curl.c b/src/curl.c
index 67ccb7d..7b9c858 100644
--- a/src/curl.c
+++ b/src/curl.c
@@ -182,17 +182,17 @@ int download_pkg(const rc_config *global_config,pkg_info_t *pkg){
if( global_config->dl_stats == TRUE ){
int dl_total_size = pkg->size_c - (f_size/1024);
- printf(_("Downloading %s %s %s [%0.1d%c]...\n"),
+ printf(_("Downloading %s %s %s [%0.1d%s]...\n"),
pkg->mirror,pkg->name,pkg->version,
( dl_total_size > 1024 ) ? dl_total_size / 1024 : dl_total_size,
- ( dl_total_size > 1024 ) ? 'M' : 'K'
+ ( dl_total_size > 1024 ) ? "MB" : "kB"
);
}else{
int dl_total_size = pkg->size_c - (f_size/1024);
- printf(_("Downloading %s %s %s [%0.1d%c]..."),
+ printf(_("Downloading %s %s %s [%0.1d%s]..."),
pkg->mirror,pkg->name,pkg->version,
( dl_total_size > 1024 ) ? dl_total_size / 1024 : dl_total_size,
- ( dl_total_size > 1024 ) ? 'M' : 'K'
+ ( dl_total_size > 1024 ) ? "MB" : "kB"
);
}
diff --git a/src/transaction.c b/src/transaction.c
index 1ae4aaa..f5a4c48 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -178,17 +178,17 @@ int handle_transaction(const rc_config *global_config, transaction_t *tran){
}
if( already_download_size > 0 ){
- printf(_("Need to get %0.1d%c/%0.1d%c of archives.\n"),
+ printf(_("Need to get %0.1d%s/%0.1d%s of archives.\n"),
(need_to_download_size > 1024 ) ? need_to_download_size / 1024
: need_to_download_size,
- (need_to_download_size > 1024 ) ? 'M' : 'K',
+ (need_to_download_size > 1024 ) ? "MB" : "kB",
(download_size > 1024 ) ? download_size / 1024 : download_size,
- (download_size > 1024 ) ? 'M' : 'K'
+ (download_size > 1024 ) ? "MB" : "kB"
);
}else{
- printf(_("Need to get %0.1d%c of archives.\n"),
+ printf(_("Need to get %0.1d%s of archives.\n"),
(download_size > 1024 ) ? download_size / 1024 : download_size,
- (download_size > 1024 ) ? 'M' : 'K'
+ (download_size > 1024 ) ? "MB" : "kB"
);
}
}
@@ -199,16 +199,16 @@ int handle_transaction(const rc_config *global_config, transaction_t *tran){
if( global_config->download_only == FALSE ){
if( (int)uncompressed_size < 0 ){
uncompressed_size *= -1;
- printf(_("After unpacking %0.1d%c disk space will be freed.\n"),
+ printf(_("After unpacking %0.1d%s disk space will be freed.\n"),
(uncompressed_size > 1024 ) ? uncompressed_size / 1024
: uncompressed_size,
- (uncompressed_size > 1024 ) ? 'M' : 'K'
+ (uncompressed_size > 1024 ) ? "MB" : "kB"
);
}else{
- printf(_("After unpacking %0.1d%c of additional disk space will be used.\n"),
+ printf(_("After unpacking %0.1d%s of additional disk space will be used.\n"),
(uncompressed_size > 1024 ) ? uncompressed_size / 1024
: uncompressed_size,
- (uncompressed_size > 1024 ) ? 'M' : 'K'
+ (uncompressed_size > 1024 ) ? "MB" : "kB"
);
}
}