Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Cameron Nemo
mountall
Commits
34ef859f
Commit
34ef859f
authored
Jun 07, 2011
by
Bryce Harrington
Committed by
Bazaar Package Importer
Jun 07, 2011
Browse files
Correct grammar on user-visible strings
(LP: #572016)
parent
0d6e606f
Changes
2
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
34ef859f
mountall (2.26) oneiric; urgency=low
* Correct grammar on user-visible strings
(LP: #572016)
-- Bryce Harrington <bryce@ubuntu.com> Tue, 07 Jun 2011 12:16:22 -0700
mountall (2.25ubuntu1) natty; urgency=low
* Fixed two errors found while browsing the code: 1) find_mount("/") returns
...
...
src/mountall.c
View file @
34ef859f
...
...
@@ -1971,7 +1971,7 @@ run_mount (Mount *mnt,
*/
if
((
errno
!=
EEXIST
)
&&
has_option
(
mnt
,
"optional"
,
FALSE
))
{
nih_debug
(
"%s: mountpoint doesn't exist
,
ignoring"
,
nih_debug
(
"%s: mountpoint doesn't exist
;
ignoring"
,
MOUNT_NAME
(
mnt
));
mounted
(
mnt
);
return
;
...
...
@@ -3158,37 +3158,37 @@ plymouth_update (int only_clear)
/* Display that message */
switch
(
plymouth_error
)
{
case
ERROR_BORED
:
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"The disk drive for %s is not ready yet or not present"
),
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"The disk drive for %s is not ready yet or not present
.
"
),
MOUNT_NAME
(
plymouth_mnt
)));
keys_message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
"keys:%s"
,
_
(
"Continue to wait
;
or Press S to skip mounting or M for manual recovery"
)));
_
(
"Continue to wait
,
or Press S to skip mounting or M for manual recovery"
)));
plymouth_keys
=
"SsMm"
;
break
;
case
ERROR_FSCK_FAILED
:
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"Errors were found while checking the disk drive for %s"
),
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"Errors were found while checking the disk drive for %s
.
"
),
MOUNT_NAME
(
plymouth_mnt
)));
keys_message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
"keys:%s"
,
_
(
"Press F to attempt to fix the errors, I to ignore, S to skip mounting or M for manual recovery"
)));
_
(
"Press F to attempt to fix the errors, I to ignore, S to skip mounting
,
or M for manual recovery"
)));
plymouth_keys
=
"FfIiSsMm"
;
break
;
case
ERROR_FSCK_FAILED_HARD
:
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"Serious errors were found while checking the disk drive for %s"
),
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"Serious errors were found while checking the disk drive for %s
.
"
),
MOUNT_NAME
(
plymouth_mnt
)));
keys_message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
"keys:%s"
,
_
(
"Press I to ignore, S to skip mounting or M for manual recovery"
)));
_
(
"Press I to ignore, S to skip mounting
,
or M for manual recovery"
)));
plymouth_keys
=
"IiSsMm"
;
break
;
case
ERROR_MOUNT_FAILED
:
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"An error occurred while mounting %s"
),
message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
_
(
"An error occurred while mounting %s
.
"
),
MOUNT_NAME
(
plymouth_mnt
)));
keys_message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
"keys:%s"
,
_
(
"Press S to skip mounting or M for manual recovery"
)));
plymouth_keys
=
"SsMm"
;
break
;
case
ERROR_FSCK_IN_PROGRESS
:
message
=
NIH_MUST
(
nih_strdup
(
NULL
,
_
(
"
Your
disk drives are
being checked
for errors. This may take s
ome time
"
)));
message
=
NIH_MUST
(
nih_strdup
(
NULL
,
_
(
"
Checking
disk drives are for errors. This may take s
everal minutes.
"
)));
keys_message
=
NIH_MUST
(
nih_sprintf
(
NULL
,
"keys:%s"
,
_
(
"Press C to cancel all checks
currently
in progress"
)));
_
(
"Press C to cancel all checks in progress"
)));
plymouth_keys
=
"Cc"
;
break
;
default:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment