mirror of
https://github.com/systemd/systemd
synced 2026-03-06 05:04:45 +01:00
Compare commits
7 Commits
fc874bf3bf
...
b17f651a17
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b17f651a17 | ||
|
|
fa8342228b | ||
|
|
d66b0ed4cc | ||
|
|
6ef03f7a0d | ||
|
|
17f8a21fd0 | ||
|
|
04b2224957 | ||
|
|
7b87bece5d |
21
po/de.po
21
po/de.po
@ -4,21 +4,22 @@
|
||||
# Christian Kirbach <Christian.Kirbach@gmail.com>, 2014, 2015.
|
||||
# Benjamin Steinwender <b@stbe.at>, 2014.
|
||||
# Bernd Homuth <dev@hmt.im>, 2015.
|
||||
#
|
||||
# Fabian Affolter <mail@fabian-affolter.ch>, 2020.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: systemd master\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-08-19 18:02+0200\n"
|
||||
"PO-Revision-Date: 2015-09-19 20:02+0200\n"
|
||||
"Last-Translator: Bernd Homuth <dev@hmt.im>\n"
|
||||
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
|
||||
"PO-Revision-Date: 2020-12-13 14:36+0000\n"
|
||||
"Last-Translator: Fabian Affolter <mail@fabian-affolter.ch>\n"
|
||||
"Language-Team: German <https://translate.fedoraproject.org/projects/systemd/"
|
||||
"master/de/>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Generator: Gtranslator 2.91.6\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 4.3.2\n"
|
||||
|
||||
#: src/core/org.freedesktop.systemd1.policy.in:22
|
||||
msgid "Send passphrase back to system"
|
||||
@ -72,7 +73,7 @@ msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig."
|
||||
|
||||
#: src/home/org.freedesktop.home1.policy:13
|
||||
msgid "Create a home area"
|
||||
msgstr ""
|
||||
msgstr "Zuhause-Bereich erzeugen"
|
||||
|
||||
#: src/home/org.freedesktop.home1.policy:14
|
||||
#, fuzzy
|
||||
@ -82,7 +83,7 @@ msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig."
|
||||
|
||||
#: src/home/org.freedesktop.home1.policy:23
|
||||
msgid "Remove a home area"
|
||||
msgstr ""
|
||||
msgstr "Zuhause-Bereich entfernen"
|
||||
|
||||
#: src/home/org.freedesktop.home1.policy:24
|
||||
#, fuzzy
|
||||
@ -92,7 +93,7 @@ msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig."
|
||||
|
||||
#: src/home/org.freedesktop.home1.policy:33
|
||||
msgid "Check credentials of a home area"
|
||||
msgstr ""
|
||||
msgstr "Prüfen Sie die Zugangsdaten für den Zuhause-Bereich"
|
||||
|
||||
# https://www.freedesktop.org/software/systemd/man/sd-login.html
|
||||
#: src/home/org.freedesktop.home1.policy:34
|
||||
@ -107,7 +108,7 @@ msgstr ""
|
||||
|
||||
#: src/home/org.freedesktop.home1.policy:43
|
||||
msgid "Update a home area"
|
||||
msgstr ""
|
||||
msgstr "Zuhause-Bereich aktualisieren"
|
||||
|
||||
# https://www.freedesktop.org/software/systemd/man/sd-login.html
|
||||
#: src/home/org.freedesktop.home1.policy:44
|
||||
|
||||
@ -2741,12 +2741,14 @@ int journal_file_compare_locations(JournalFile *af, JournalFile *bf) {
|
||||
assert(af->location_type == LOCATION_SEEK);
|
||||
assert(bf->location_type == LOCATION_SEEK);
|
||||
|
||||
/* If contents and timestamps match, these entries are
|
||||
* identical, even if the seqnum does not match */
|
||||
/* If contents, timestamps and seqnum match, these entries are
|
||||
* identical*/
|
||||
if (sd_id128_equal(af->current_boot_id, bf->current_boot_id) &&
|
||||
af->current_monotonic == bf->current_monotonic &&
|
||||
af->current_realtime == bf->current_realtime &&
|
||||
af->current_xor_hash == bf->current_xor_hash)
|
||||
af->current_xor_hash == bf->current_xor_hash &&
|
||||
sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id) &&
|
||||
af->current_seqnum == bf->current_seqnum)
|
||||
return 0;
|
||||
|
||||
if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) {
|
||||
|
||||
@ -448,6 +448,9 @@ _pure_ static int compare_with_location(const JournalFile *f, const Location *l,
|
||||
f->current_realtime == l->realtime &&
|
||||
l->xor_hash_set &&
|
||||
f->current_xor_hash == l->xor_hash &&
|
||||
l->seqnum_set &&
|
||||
sd_id128_equal(f->header->seqnum_id, l->seqnum_id) &&
|
||||
f->current_seqnum == l->seqnum &&
|
||||
f != current_file)
|
||||
return 0;
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include "alloc-util.h"
|
||||
#include "bus-internal.h"
|
||||
#include "bus-message.h"
|
||||
#include "escape.h"
|
||||
#include "hexdecoct.h"
|
||||
#include "string-util.h"
|
||||
|
||||
@ -91,8 +92,13 @@ bool interface_name_is_valid(const char *p) {
|
||||
(!dot && *q >= '0' && *q <= '9') ||
|
||||
*q == '_';
|
||||
|
||||
if (!good)
|
||||
if (!good) {
|
||||
if (DEBUG_LOGGING) {
|
||||
_cleanup_free_ char *iface = cescape(p);
|
||||
log_debug("The interface %s is invalid as it contains special character", strnull(iface));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
dot = false;
|
||||
}
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
#include "fd-util.h"
|
||||
#include "fileio.h"
|
||||
#include "fs-util.h"
|
||||
#include "label.h"
|
||||
#include "ordered-set.h"
|
||||
#include "resolved-conf.h"
|
||||
#include "resolved-dns-server.h"
|
||||
@ -364,7 +365,7 @@ int manager_write_resolv_conf(Manager *m) {
|
||||
log_error_errno(r, "Failed to move new %s into place: %m", PRIVATE_STUB_RESOLV_CONF);
|
||||
|
||||
} else {
|
||||
r = symlink_atomic(basename(PRIVATE_UPLINK_RESOLV_CONF), PRIVATE_STUB_RESOLV_CONF);
|
||||
r = symlink_atomic_label(basename(PRIVATE_UPLINK_RESOLV_CONF), PRIVATE_STUB_RESOLV_CONF);
|
||||
if (r < 0)
|
||||
log_error_errno(r, "Failed to symlink %s: %m", PRIVATE_STUB_RESOLV_CONF);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user