Skip to content

Commit

Permalink
merged with master
Browse files Browse the repository at this point in the history
  • Loading branch information
schubi2 committed Feb 19, 2020
2 parents bfc459f + d4382e9 commit 097e179
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 10 deletions.
6 changes: 3 additions & 3 deletions library/general/src/modules/FileUtils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def CheckAndCreatePath(pathvalue)
# TRANSLATORS: popup question (with continue / cancel buttons)
# %1 is the filesystem path
_(
"Although the path %1 exists, it is not a directory.\nContinue or cancel the operation?\n"
"Although the path %1 exists, it is not a directory.\nContinue or cancel the operation?"
),
pathvalue
)
Expand All @@ -295,7 +295,7 @@ def CheckAndCreatePath(pathvalue)
Builtins.sformat(
# TRANSLATORS: question popup (with yes / no buttons). A user entered non-existent path
# for a share, %1 is entered path
_("The path %1 does not exist.\nCreate it now?\n"),
_("The path %1 does not exist.\nCreate it now?"),
pathvalue
)
)
Expand All @@ -315,7 +315,7 @@ def CheckAndCreatePath(pathvalue)
# TRANSLATORS: popup question (with continue / cancel buttons)
# %1 is the name (path) of the directory
_(
"Failed to create the directory %1.\nContinue or cancel the current operation?\n"
"Failed to create the directory %1.\nContinue or cancel the current operation?"
),
pathvalue
)
Expand Down
8 changes: 4 additions & 4 deletions library/gpg/src/modules/GPGWidgets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def PrivateKeySelection
"void (string, map)"
),
"help" => _(
"<p><big><b>GPG Private Key</b></big><br>\nThe table contains list of the private GPG keys.</p>"
"<p><big><b>GPG Private Key</b></big><br>\nThe table contains a list of private GPG keys.</p>"
)
}
end
Expand Down Expand Up @@ -235,7 +235,7 @@ def PublicKeySelection
"void (string, map)"
),
"help" => _(
"<p><big><b>GPG Public Key</b></big><br>\nThe table contains list of the public GPG keys.</p>"
"<p><big><b>GPG Public Key</b></big><br>\nThe table contains a list of public GPG keys.</p>"
)
}
end
Expand Down Expand Up @@ -282,7 +282,7 @@ def CreateNewKey
"handle" => fun_ref(method(:GpgNewKey), "symbol (string, map)"),
"help" => _(
"<p><big><b>Create a new GPG key</b></big><br>\n" \
"<tt>gpg --gen-key</tt> is started, see <tt>gpg</tt> manual pager for more information.\n" \
"<tt>gpg --gen-key</tt> is started, see the <tt>gpg</tt> manual page for more information.\n" \
"Press Ctrl+C to cancel.\n" \
"</p>"
)
Expand Down Expand Up @@ -327,7 +327,7 @@ def AskPassphraseWidget(key)
),
# help text
"help" => _(
"<p><big><b>Passphrase</b></big><br>\nEnter passphrase to unlock the GPG key."
"<p><big><b>Passphrase</b></big><br>\nEnter the passphrase to unlock the GPG key."
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion library/network/src/modules/SuSEFirewallProposal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def ProposalSummary
# TRANSLATORS: Proposal informative text
output = "<ul>" +
_(
"SuSEfirewall2 package is not installed, firewall will be disabled."
"The SuSEfirewall2 package is not installed. The firewall will be disabled."
) + "</ul>"

return { "output" => output, "warning" => warning }
Expand Down
8 changes: 7 additions & 1 deletion package/yast2.changes
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
-------------------------------------------------------------------
Tue Feb 4 15:15:37 UTC 2020 - schubi@suse.de
Mon Feb 17 17:59:07 UTC 2020 - schubi@suse.de

- SysctlConfig class: Handle sysctl entries in different
directories (bsc#1151649).
- 4.2.66

-------------------------------------------------------------------
Mon Feb 17 16:59:07 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>

- Fixed user-visible messages (bsc#1084015)
- 4.2.65

-------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion package/yast2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2
Version: 4.2.65
Version: 4.2.66
Release: 0
Summary: YaST2 Main Package
License: GPL-2.0-only
Expand Down

0 comments on commit 097e179

Please sign in to comment.