[systemd-commits] 3 commits - catalog/systemd-fr.catalog catalog/systemd.fr.catalog catalog/systemd-it.catalog catalog/systemd.it.catalog catalog/systemd-ru.catalog catalog/systemd.ru.catalog Makefile.am src/core src/journal TODO
Zbigniew JÄdrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Mon Dec 2 19:13:12 PST 2013
Makefile.am | 6
TODO | 5
catalog/systemd-fr.catalog | 260 ---------------------------------------
catalog/systemd-it.catalog | 254 --------------------------------------
catalog/systemd-ru.catalog | 294 ---------------------------------------------
catalog/systemd.fr.catalog | 260 +++++++++++++++++++++++++++++++++++++++
catalog/systemd.it.catalog | 254 ++++++++++++++++++++++++++++++++++++++
catalog/systemd.ru.catalog | 294 +++++++++++++++++++++++++++++++++++++++++++++
src/core/job.c | 11 +
src/core/job.h | 3
src/core/unit.c | 5
src/journal/catalog.c | 57 +++++++-
src/journal/catalog.h | 1
src/journal/test-catalog.c | 24 +++
14 files changed, 898 insertions(+), 830 deletions(-)
New commits:
commit a6e9f2b911ce13618b3f0fcd3d23ecb6471e07ba
Author: Zbigniew JÄdrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Mon Dec 2 20:29:10 2013 -0500
catalog: rename files to specify language in the filename
diff --git a/Makefile.am b/Makefile.am
index 4007d2a..f238d85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3248,9 +3248,9 @@ pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
dist_catalog_DATA = \
- catalog/systemd-fr.catalog \
- catalog/systemd-ru.catalog \
- catalog/systemd-it.catalog \
+ catalog/systemd.fr.catalog \
+ catalog/systemd.ru.catalog \
+ catalog/systemd.it.catalog \
catalog/systemd.catalog
SOCKETS_TARGET_WANTS += \
diff --git a/catalog/systemd-fr.catalog b/catalog/systemd-fr.catalog
deleted file mode 100644
index 3ec7d8e..0000000
--- a/catalog/systemd-fr.catalog
+++ /dev/null
@@ -1,260 +0,0 @@
-# This file is part of systemd.
-#
-# Copyright 2012 Lennart Poettering
-# Copyright 2013 Sylvain Plantefève
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-# Message catalog for systemd's own messages
-# French translation
-
-# Le format du catalogue de messages est décrit (en anglais) içi :
-# http://www.freedesktop.org/wiki/Software/systemd/catalog
-
--- f77379a8490b408bbe5f6940505a777b fr
-Subject: Le Journal a été démarré
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Le processus du journal système a démarré, ouvert ses fichiers en écriture
-et est prêt à traiter les requêtes.
-
--- d93fb3c9c24d451a97cea615ce59c00b fr
-Subject: Le Journal a été arrêté
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Le processus du journal système a été arrêté et tous ses fichiers actifs
-ont été fermés.
-
--- a596d6fe7bfa4994828e72309e95d61e fr
-Subject: Des messages d'un service ont été supprimés
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: man:journald.conf(5)
-
-Un service a essayé d'enregistrer un trop grand nombre de messages sur un
-intervalle de temps donné. Des messages de ce service ont été évincés.
-
-Notez que seuls des messages de ce service ont été évincés, les messages des
-autres services ne sont pas affectés.
-
-Les limites définissant ce comportement peuvent être configurées avec les
-paramètres RateLimitInterval= et RateLimitBurst= dans le fichier
-/etc/systemd/journald.conf. Voir journald.conf(5) pour plus de détails.
-
--- e9bf28e6e834481bb6f48f548ad13606 fr
-Subject: Des messages du Journal ont été manqués
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Des messages du noyau ont été manqués car le journal système n'a pas été
-capable de les traiter suffisament vite.
-
--- fc2e22bc6ee647b6b90729ab34a250b1 fr
-Subject: Le processus @COREDUMP_PID@ (@COREDUMP_COMM@) a généré un fichier « core »
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: man:core(5)
-
-Le processus @COREDUMP_PID@ (@COREDUMP_COMM@) a planté et généré un fichier « core ».
-
-Cela indique généralement une erreur de programmation dans le programme
-incriminé, et cela devrait être notifié à son concepteur comme un défaut (bug).
-
--- 8d45620c1a4348dbb17410da57c60c66 fr
-Subject: Une nouvelle session @SESSION_ID@ a été créée pour l'utilisateur @USER_ID@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-Une nouvelle session a été créée pour l'utilisateur @USER_ID@ avec
-l'identifiant (ID) @SESSION_ID at .
-
-Le processus maître de la session est @LEADER at .
-
--- 3354939424b4456d9802ca8333ed424a fr
-Subject: La session @SESSION_ID@ s'est terminée
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-La session d'identifiant (ID) @SESSION_ID@ s'est terminée.
-
--- fcbefc5da23d428093f97c82a9290f7b fr
-Subject: Un nouveau poste (seat) @SEAT_ID@ est disponible
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-Un nouveau poste (seat) @SEAT_ID@ a été configuré et est maintenant disponible.
-
--- e7852bfe46784ed0accde04bc864c2d5 fr
-Subject: Le poste (seat) @SEAT_ID@ a été retiré
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-Le poste (seat) @SEAT_ID@ a été retiré et n'est plus disponible.
-
--- c7a787079b354eaaa9e77b371893cd27 fr
-Subject: Changement d'heure
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'horloge système a été modifiée et positionnée à @REALTIME@ microsecondes
-après le 1er janvier 1970.
-
--- 45f82f4aef7a4bbf942ce861d1f20990 fr
-Subject: Fuseau horaire modifié en @TIMEZONE@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Le fuseau horaire du système a été modifié et positionné à @TIMEZONE at .
-
--- b07a249cd024414a82dd00cd181378ff fr
-Subject: Le démarrage du système est terminé
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Tous les services nécessaires au démarrage du système ont été lancés avec
-succès. Notez que cela ne signifie pas que le système est maintenant au
-repos, car des services peuvent encore être en train de terminer leur
-démarrage.
-
-Le chargement du noyau a nécessité @KERNEL_USEC@ microsecondes.
-
-Le chargement du « RAM disk » initial a nécessité @INITRD_USEC@ microsecondes.
-
-Le chargement de l'espace utilisateur a nécessité @USERSPACE_USEC@ microsecondes.
-
--- 6bbd95ee977941e497c48be27c254128 fr
-Subject: Le système entre dans l'état de repos (sleep state) @SLEEP@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Le système est maintenant à l'état de repos (sleep state) @SLEEP at .
-
--- 8811e6df2a8e40f58a94cea26f8ebf14 fr
-Subject: Le système sorti de l'état de repos (sleep state) @SLEEP@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Le système est maintenant sorti de l'état de repos (sleep state) @SLEEP at .
-
--- 98268866d1d54a499c4e98921d93bc40 fr
-Subject: Arrêt du système amorcé
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'arrêt du système a été amorcé. L'arrêt a maintenant commencé, tous les
-services du système sont terminés et tous les systèmes de fichiers sont
-démontés.
-
--- 7d4958e842da4a758f6c1cdc7b36dcc5 fr
-Subject: L'unité (unit) @UNIT@ a commencé à démarrer
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unité (unit) @UNIT@ a commencé à démarrer.
-
--- 39f53479d3a045ac8e11786248231fbf fr
-Subject: L'unité (unit) @UNIT@ a terminé son démarrage
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unité (unit) @UNIT@ a terminé son démarrage, avec le résultat @RESULT at .
-
--- de5b426a63be47a7b6ac3eaac82e2f6f fr
-Subject: L'unité (unit) @UNIT@ a commencé à s'arrêter
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unité (unit) @UNIT@ a commencé à s'arrêter.
-
--- 9d1aaa27d60140bd96365438aad20286 fr
-Subject: L'unité (unit) @UNIT@ a terminé son arrêt
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unité (unit) @UNIT@ a terminé son arrêt.
-
--- be02cf6855d2428ba40df7e9d022f03d fr
-Subject: L'unité (unit) @UNIT@ a échoué
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unité (unit) @UNIT@ a échoué, avec le résultat @RESULT at .
-
--- d34d037fff1847e6ae669a370e694725 fr
-Subject: L'unité (unit) @UNIT@ a commencé à recharger sa configuration
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unité (unit) @UNIT@ a commencé à recharger sa configuration.
-
--- 7b05ebc668384222baa8881179cfda54 fr
-Subject: L'unité (unit) @UNIT@ a terminé de recharger configuration
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unité (unit) @UNIT@ a terminé de recharger configuration,
-avec le résultat @RESULT at .
-
--- 641257651c1b4ec9a8624d7a40a9e1e7 fr
-Subject: Le processus @EXECUTABLE@ n'a pas pu être exécuté
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Le processus @EXECUTABLE@ n'a pas pu être exécuté, et a donc echoué.
-
-Le code d'erreur renvoyé est @ERRNO at .
-
--- 0027229ca0644181a76c4e92458afa2e fr
-Subject: Un ou plusieurs messages n'ont pas pu être transmis à syslog
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Un ou plusieurs messages n'ont pas pu être transmis au service syslog
-s'exécutant conjointement avec journald. Cela indique généralement que
-l'implémentation de syslog utilisée n'a pas été capable de suivre la cadence
-du flux de messages.
-
--- 1dee0369c7fc4736b7099b38ecb46ee7 fr
-Subject: Le point de montage n'est pas vide
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Le répertoire @WHERE@ est spécifié comme point de montage (second champ du
-fichier /etc/fstab, ou champ Where= dans une unité (unit) systemd) et n'est pas
-vide.
-Cela ne perturbe pas le montage du système de fichiers, mais les fichiers
-préalablement présents dans ce répertoire sont devenus inaccessibles.
-Pour atteindre ces fichiers, veuillez monter manuellement le système de
-fichiers sous-jacent à un autre emplacement.
-
--- 24d8d4452573402496068381a6312df2 fr
-Subject: Une machine virtuelle ou un conteneur (container) a été démarré
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-La machine virtuelle @NAME@ a été démarrée avec le PID maître @LEADER@,
-et est maintenant prête à l'emploi.
-
--- 58432bd3bace477cb514b56381b8a758 fr
-Subject: Une machine virtuelle ou un conteneur (container) a été arrêté
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-La machine virtuelle @NAME@ avec le PID maître @LEADER@ a été arrêtée.
diff --git a/catalog/systemd-it.catalog b/catalog/systemd-it.catalog
deleted file mode 100644
index e81e005..0000000
--- a/catalog/systemd-it.catalog
+++ /dev/null
@@ -1,254 +0,0 @@
-# This file is part of systemd.
-#
-# Copyright 2013 Daniele Medri
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-# Message catalog for systemd's own messages
-
--- f77379a8490b408bbe5f6940505a777b it
-Subject: Il registro è stato avviato
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Il processo relativo al registro di sistema è stato avviato, ha aperto i
-file in scrittura ed è ora pronto a gestire richieste.
-
--- d93fb3c9c24d451a97cea615ce59c00b it
-Subject: Il registro è stato terminato
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Il processo relativo al registro di sistema è stato terminato e ha chiuso
-tutti i file attivi.
-
--- a596d6fe7bfa4994828e72309e95d61e it
-Subject: I messaggi di un servizio sono stati soppressi
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: man:journald.conf(5)
-
-Un servizio ha registrato troppi messaggi in un dato periodo di tempo.
-I messaggi del servizio sono stati eliminati.
-
-Solo i messaggi del servizio indicato sono stati
-eliminati, i messaggi degli altri servizi rimangono invariati.
-
-I limiti oltre i quali i messaggi si eliminano si configurano
-con RateLimitInterval= e RateLimitBurst= in
-/etc/systemd/journald.conf. Vedi journald.conf(5) per maggiori informazioni.
-
--- e9bf28e6e834481bb6f48f548ad13606 it
-Subject: I messaggi di un servizio sono stati perduti
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-I messaggi del kernel sono stati perduti perché, il registro di sistema
-non è stato in grado di gestirli abbastanza velocemente.
-
--- fc2e22bc6ee647b6b90729ab34a250b1 it
-Subject: Il processo @COREDUMP_PID@ (@COREDUMP_COMM@) ha generato un dump.
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: man:core(5)
-
-Il processo @COREDUMP_PID@ (@COREDUMP_COMM@) si è bloccato generando un dump.
-
-Questo di solito capita per un errore di programmazione nell'applicazione e
-dovrebbe essere segnalato al vendor come un bug.
-
--- 8d45620c1a4348dbb17410da57c60c66 it
-Subject: La nuova sessione @SESSION_ID@ è stata creata per l'utente @USER_ID@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-Una nuova sessione con ID @SESSION_ID@ è stata creata per l'utente @USER_ID at .
-
-Il processo primario della sessione è @LEADER at .
-
--- 3354939424b4456d9802ca8333ed424a it
-Subject: La sessione @SESSION_ID@ è terminata
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-La sessione con ID @SESSION_ID@ è terminata.
-
--- fcbefc5da23d428093f97c82a9290f7b it
-Subject: La nuova postazione @SEAT_ID@ è ora disponibile
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-La nuova postazione @SEAT_ID@ è stata configurata ed è ora disponibile.
-
--- e7852bfe46784ed0accde04bc864c2d5 it
-Subject: La postazione @SEAT_ID@ è stata rimossa
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-La postazione @SEAT_ID@ è stata rimossa e non è più disponibile.
-
--- c7a787079b354eaaa9e77b371893cd27 it
-Subject: Cambio d'orario
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'orologio di sistema è cambiato in @REALTIME@ microsecondi dal 1 gennaio, 1970.
-
--- 45f82f4aef7a4bbf942ce861d1f20990 it
-Subject: Il fuso orario è cambiato in @TIMEZONE@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Il fuso orario di sistema è cambiato in @TIMEZONE at .
-
--- b07a249cd024414a82dd00cd181378ff it
-Subject: Avvio del sistema completato.
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Tutti i servizi di sistema richiesti per la fase di avvio sono stati eseguiti
-con successo. Nota che la macchina potrebbe non essere ancora pronta in quanto
-i servizi attivati sono in fase di completamento.
-
-L'avvio del kernel ha richiesto @KERNEL_USEC@ microsecondi.
-
-L'avvio del disco RAM ha richiesto @INITRD_USEC@ microsecondi.
-
-L'avvio dello userspace ha richiesto @USERSPACE_USEC@ microsecondi.
-
--- 6bbd95ee977941e497c48be27c254128 it
-Subject: Il sistema è entrato in fase di pausa @SLEEP@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Il sistema è entrato nello stato di pausa @SLEEP at .
-
--- 8811e6df2a8e40f58a94cea26f8ebf14 it
-Subject: Il sistema è uscito dalla fase di pausa @SLEEP@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Il sistema è uscito dallo stato di pausa @SLEEP at .
-
--- 98268866d1d54a499c4e98921d93bc40 it
-Subject: Il sistema è in fase di spegnimento
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Systemd è in fase di spegnimento. Tutti i servizi di sistema
-saranno terminati e tutti i file systems smontati.
-
--- 7d4958e842da4a758f6c1cdc7b36dcc5 it
-Subject: L'unità @UNIT@ inizia la fase di avvio
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unità @UNIT@ ha iniziato la fase di avvio.
-
--- 39f53479d3a045ac8e11786248231fbf it
-Subject: L'unità @UNIT@ termina la fase di avvio
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unità @UNIT@ ha terminato la fase di avvio.
-
-La fase di avvio è @RESULT at .
-
--- de5b426a63be47a7b6ac3eaac82e2f6f it
-Subject: L'unità @UNIT@ inizia la fase di spegnimento
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unità @UNIT@ ha iniziato la fase di spegnimento.
-
--- 9d1aaa27d60140bd96365438aad20286 it
-Subject: L'unità @UNIT@ termina la fase di spegnimento
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unità @UNIT@ ha terminato la fase di spegnimento.
-
--- be02cf6855d2428ba40df7e9d022f03d it
-Subject: L'unità @UNIT@ è fallita
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unità @UNIT@ è fallita.
-
-Il risultato è @RESULT at .
-
--- d34d037fff1847e6ae669a370e694725 it
-Subject: L'unità @UNIT@ inizia a caricare la propria configurazione
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unità @UNIT@ è iniziata ricaricando la propria configurazione
-
--- 7b05ebc668384222baa8881179cfda54 it
-Subject: L'unità @UNIT@ termina il caricamento della propria configurazione
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-L'unità @UNIT@ è terminata ricaricando la propria configurazione
-
-Il risultato è @RESULT at .
-
--- 641257651c1b4ec9a8624d7a40a9e1e7 it
-Subject: Il processo @EXECUTABLE@ non può essere eseguito
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Il processo @EXECUTABLE@ non può essere eseguito e termina.
-
-Il numero di errore restituito durante l'esecuzione del processo è @ERRNO at .
-
--- 0027229ca0644181a76c4e92458afa2e it
-Subject: Uno o più messaggi non possono essere inoltrati a syslog
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Uno o più messaggi non possono essere inviati al servizio syslog
-eseguito in parallelo a journald. Questo di solito capita perché,
-l'implementazione di syslog non sta al passo con la
-velocità dei messaggi accodati.
-
--- 1dee0369c7fc4736b7099b38ecb46ee7 it
-Subject: Il punto di montaggio non è vuoto
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-La directory @WHERE@ è specificata come punto di montaggio (secondo campo
-in /etc/fstab o nel campo Where= del file unità di systemd) e non è vuoto.
-Questo non interferisce con il montaggio, ma i file pre-esistenti in questa
-directory diventano inaccessibili. Per visualizzare i file, si suggerisce
-di montare manualmente il file system indicato in una posizione secondaria.
-
--- 24d8d4452573402496068381a6312df2 it
-Subject: Avviata macchina virtuale o container
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-La macchina virtuale @NAME@ con PID primario @LEADER@ è stata
-avviata ed è pronta all'uso.
-
--- 58432bd3bace477cb514b56381b8a758 it
-Subject: Terminata macchina virtuale o container
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-La macchina virtuale @NAME@ con PID primario @LEADER@ è stata spenta.
diff --git a/catalog/systemd-ru.catalog b/catalog/systemd-ru.catalog
deleted file mode 100644
index 5824f88..0000000
--- a/catalog/systemd-ru.catalog
+++ /dev/null
@@ -1,294 +0,0 @@
-# This file is part of systemd.
-#
-# Copyright 2012 Lennart Poettering
-# Copyright 2013 Sergey Ptashnick
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-# Message catalog for systemd's own messages
-# Russian translation
-
-# ФоÑÐ¼Ð°Ñ ÐºÐ°Ñалога ÑообÑений опиÑан по ÑÑÑлке
-# http://www.freedesktop.org/wiki/Software/systemd/catalog
-
-# ÐеÑед каждÑм ÑлеменÑом в комменÑаÑии Ñказан Subject иÑÑ
одного
-# ÑообÑÐµÐ½Ð¸Ñ (на английÑком).
-
-# Subject: The Journal has been started
--- f77379a8490b408bbe5f6940505a777b ru
-Subject: ÐапÑÑена ÑлÑжба жÑÑналиÑованиÑ
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐÑоÑеÑÑ, оÑвеÑаÑÑий за жÑÑналиÑование ÑиÑÑемнÑÑ
ÑобÑÑий, ÑÑпеÑно запÑÑÑилÑÑ,
-оÑкÑÑл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи ÑÐ°Ð¹Ð»Ñ Ð¶ÑÑнала, и гоÑов обÑабаÑÑваÑÑ Ð·Ð°Ð¿ÑоÑÑ.
-
-# Subject: The Journal has been stopped
--- d93fb3c9c24d451a97cea615ce59c00b ru
-Subject: СлÑжба жÑÑналиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑÑановлена
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐÑоÑеÑÑ, оÑвеÑаÑÑий за жÑÑналиÑование ÑиÑÑемнÑÑ
ÑобÑÑий, завеÑÑил ÑабоÑÑ Ð¸
-закÑÑл вÑе Ñвои ÑайлÑ.
-
-# Subject: Messages from a service have been suppressed
--- a596d6fe7bfa4994828e72309e95d61e ru
-Subject: ЧаÑÑÑ ÑообÑений Ð¾Ñ ÑлÑÐ¶Ð±Ñ Ð¿ÑопÑÑена
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: man:journald.conf(5)
-
-СлÑжба оÑпÑавила ÑлиÑком много ÑообÑений за коÑоÑкий пÑомежÑÑок вÑемени.
-ЧаÑÑÑ ÑообÑений бÑла пÑопÑÑена.
-
-ÐбÑаÑиÑе внимание, ÑÑо бÑли пÑопÑÑÐµÐ½Ñ ÑообÑÐµÐ½Ð¸Ñ ÑолÑко Ð¾Ñ ÑÑой ÑлÑжбÑ,
-ÑообÑÐµÐ½Ð¸Ñ Ð´ÑÑгиÑ
ÑлÑжб не заÑÑонÑÑÑ.
-
-ÐÑедел, поÑле коÑоÑого ÑлÑжба жÑÑнала наÑÐ¸Ð½Ð°ÐµÑ Ð¸Ð³Ð½Ð¾ÑиÑоваÑÑ ÑообÑениÑ,
-наÑÑÑаиваеÑÑÑ Ð¿Ð°ÑамеÑÑами RateLimitInterval= и RateLimitBurst= в Ñайле
-/etc/systemd/journald.conf. ÐодÑобноÑÑи ÑмоÑÑиÑе на ÑÑÑаниÑе ÑÑководÑÑва
-journald.conf(5).
-
-# Subject: Journal messages have been missed
--- e9bf28e6e834481bb6f48f548ad13606 ru
-Subject: ЧаÑÑÑ ÑообÑений ÑдÑа пÑопÑÑена
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ЧаÑÑÑ ÑообÑений, поÑÑÑпивÑиÑ
Ð¾Ñ ÑдÑа, бÑла поÑеÑÑна, Ñак как ÑлÑжба
-жÑÑналиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ ÑÑпела иÑ
обÑабоÑаÑÑ.
-
-# Subject: Process @COREDUMP_PID@ (@COREDUMP_COMM@) dumped core
--- fc2e22bc6ee647b6b90729ab34a250b1 ru
-Subject: ÐÑоÑеÑÑ @COREDUMP_PID@ (@COREDUMP_COMM@) ÑбÑоÑил дамп памÑÑи
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: man:core(5)
-
-ÐÑоÑеÑÑ @COREDUMP_PID@ (@COREDUMP_COMM@) завеÑÑилÑÑ Ð¸Ð·-за кÑиÑиÑеÑкой оÑибки.
-ÐапиÑан дамп памÑÑи.
-
-ÐеÑоÑÑно, ÑÑо пÑоизоÑло из-за оÑибки, допÑÑенной в коде пÑогÑаммÑ.
-РекомендÑеÑÑÑ ÑообÑиÑÑ ÐµÐµ ÑазÑабоÑÑикам о возникÑей пÑоблеме.
-
-# Subject: A new session @SESSION_ID@ has been created for user @USER_ID@
--- 8d45620c1a4348dbb17410da57c60c66 ru
-Subject: ÐÐ»Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ @USER_ID@ Ñоздан новÑй ÑÐµÐ°Ð½Ñ @SESSION_ID@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-ÐÐ»Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ @USER_ID@ Ñоздан новÑй ÑÐµÐ°Ð½Ñ Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом @SESSION_ID at .
-
-ÐлавнÑй пÑоÑеÑÑ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑеанÑа Ð¸Ð¼ÐµÐµÑ Ð¸Ð½Ð´ÐµÐ½ÑиÑикаÑÐ¾Ñ @LEADER at .
-
-# Subject: A session @SESSION_ID@ has been terminated
--- 3354939424b4456d9802ca8333ed424a ru
-Subject: Ð¡ÐµÐ°Ð½Ñ @SESSION_ID@ завеÑÑен
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-Ð¡ÐµÐ°Ð½Ñ Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом @SESSION_ID@ завеÑÑилÑÑ.
-
-# Subject: A new seat @SEAT_ID@ is now available
--- fcbefc5da23d428093f97c82a9290f7b ru
-Subject: Ðобавлено новое ÑабоÑее меÑÑо @SEAT_ID@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-Ðовое ÑабоÑее меÑÑо (seat) @SEAT_ID@ полноÑÑÑÑ Ð½Ð°ÑÑÑоено и гоÑово к
-иÑполÑзованиÑ.
-
-# Subject: A seat @SEAT_ID@ has now been removed
--- e7852bfe46784ed0accde04bc864c2d5 ru
-Subject: РабоÑее меÑÑо @SEAT_ID@ оÑклÑÑено
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
-
-РабоÑее меÑÑо (seat) @SEAT_ID@ бÑло оÑклÑÑено.
-
-# Subject: Time change
--- c7a787079b354eaaa9e77b371893cd27 ru
-Subject: ÐеÑÐµÐ²ÐµÐ´ÐµÐ½Ñ ÑиÑÑемнÑе ÑаÑÑ
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-СиÑÑемнÑе ÑаÑÑ Ð±Ñли пеÑеведенÑ. СейÑÐ°Ñ Ð¾Ð½Ð¸ показÑваÑÑ @REALTIME@ микÑоÑекÑнд
-Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñа 00:00:00 1 ÑнваÑÑ 1970 года.
-
-# Subject: Time zone change to @TIMEZONE@
--- 45f82f4aef7a4bbf942ce861d1f20990 ru
-Subject: ЧаÑовой поÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ на @TIMEZONE@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-СиÑÑемнÑй ÑаÑовой поÑÑ Ð±Ñл изменен. Ðовое знаÑение: @TIMEZONE at .
-
-# Subject: System start-up is now complete
--- b07a249cd024414a82dd00cd181378ff ru
-Subject: ÐапÑÑк ÑиÑÑÐµÐ¼Ñ Ð·Ð°Ð²ÐµÑÑен
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐÑе ÑиÑÑемнÑе ÑлÑжбÑ, запÑÑк коÑоÑÑÑ
пÑедпиÑан наÑÑÑойками, бÑли запÑÑенÑ.
-ÐпÑоÑем, ÑÑо еÑе не ознаÑаеÑ, ÑÑо ÑиÑÑема в даннÑй Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ð¸Ñем не занÑÑа,
-Ñак как некоÑоÑÑе ÑлÑÐ¶Ð±Ñ Ð¼Ð¾Ð³ÑÑ Ð¿ÑодолжаÑÑ Ð¸Ð½Ð¸ÑиализаÑÐ¸Ñ Ð´Ð°Ð¶Ðµ поÑле Ñого, как
-оÑÑиÑалиÑÑ Ð¾ Ñвоем запÑÑке.
-
-ÐапÑÑк ÑдÑа занÑл @KERNEL_USEC@ микÑоÑекÑнд.
-
-ÐÑоÑеÑÑÑ Ð½Ð°ÑалÑного RAM-диÑка (initrd) оÑÑабоÑали за @INITRD_USEC@ микÑоÑекÑнд.
-
-ÐапÑÑк ÑиÑÑемнÑÑ
ÑлÑжб занÑл @USERSPACE_USEC@ микÑоÑекÑнд.
-
-# Subject: System sleep state @SLEEP@ entered
--- 6bbd95ee977941e497c48be27c254128 ru
-Subject: СиÑÑема пеÑеÑла в ÑоÑÑоÑние Ñна (@SLEEP@)
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-СиÑÑема бÑла пеÑеведена в ÑоÑÑоÑние Ñна (@SLEEP@).
-
-# Subject: System sleep state @SLEEP@ left
--- 8811e6df2a8e40f58a94cea26f8ebf14 ru
-Subject: СиÑÑема вÑÑла из ÑоÑÑоÑÐ½Ð¸Ñ Ñна (@SLEEP@)
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-СиÑÑема бÑла вÑведена из ÑоÑÑоÑÐ½Ð¸Ñ Ñна (@SLEEP@).
-
-# Subject: System shutdown initiated
--- 98268866d1d54a499c4e98921d93bc40 ru
-Subject: ÐодгоÑовка ÑиÑÑÐµÐ¼Ñ Ðº вÑклÑÑениÑ
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐаÑÐ°Ñ Ð¿ÑоÑеÑÑ Ð¿Ð¾Ð´Ð³Ð¾Ñовки к вÑклÑÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑа. ÐÑÑанавливаÑÑÑÑ Ð²Ñе ÑиÑÑемнÑе
-ÑлÑжбÑ, оÑмонÑиÑÑÑÑÑÑ Ð²Ñе ÑайловÑе ÑиÑÑемÑ.
-
-# Subject: Unit @UNIT@ has begun with start-up
--- 7d4958e842da4a758f6c1cdc7b36dcc5 ru
-Subject: ÐаÑинаеÑÑÑ Ð·Ð°Ð¿ÑÑк ÑниÑа @UNIT@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐаÑÐ°Ñ Ð¿ÑоÑеÑÑ Ð·Ð°Ð¿ÑÑка ÑниÑа @UNIT at .
-
-# Subject: Unit @UNIT@ has finished start-up
--- 39f53479d3a045ac8e11786248231fbf ru
-Subject: ÐапÑÑк ÑниÑа @UNIT@ завеÑÑен
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐÑоÑеÑÑ Ð·Ð°Ð¿ÑÑка ÑниÑа @UNIT@ бÑл завеÑÑен.
-
-РезÑлÑÑаÑ: @RESULT at .
-
-# Subject: Unit @UNIT@ has begun shutting down
--- de5b426a63be47a7b6ac3eaac82e2f6f ru
-Subject: ÐаÑинаеÑÑÑ Ð¾ÑÑановка ÑниÑа @UNIT@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐаÑÐ°Ñ Ð¿ÑоÑеÑÑ Ð¾ÑÑановки ÑниÑа @UNIT at .
-
-# Subject: Unit @UNIT@ has finished shutting down
--- 9d1aaa27d60140bd96365438aad20286 ru
-Subject: ÐавеÑÑена оÑÑановка ÑниÑа @UNIT at .
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐÑоÑеÑÑ Ð¾ÑÑановки ÑниÑа @UNIT@ бÑл завеÑÑен.
-
-# Subject: Unit @UNIT@ has failed
--- be02cf6855d2428ba40df7e9d022f03d ru
-Subject: ÐÑибка ÑниÑа @UNIT@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐÑоизоÑел Ñбой ÑниÑа @UNIT at .
-
-РезÑлÑÑаÑ: @RESULT at .
-
-# Subject: Unit @UNIT@ has begun with reloading its configuration
--- d34d037fff1847e6ae669a370e694725 ru
-Subject: Ð®Ð½Ð¸Ñ @UNIT@ наÑал пеÑеÑиÑÑваÑÑ Ñвои наÑÑÑойки
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Ð®Ð½Ð¸Ñ @UNIT@ наÑал пÑоÑеÑÑ Ð¿ÐµÑеÑиÑÑÐ²Ð°Ð½Ð¸Ñ Ñвоей конÑигÑÑаÑии.
-
-# Subject: Unit @UNIT@ has finished reloading its configuration
--- 7b05ebc668384222baa8881179cfda54 ru
-Subject: Ð®Ð½Ð¸Ñ @UNIT@ завеÑÑил пеÑеÑиÑÑвание ÑвоиÑ
наÑÑÑоек
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Ð®Ð½Ð¸Ñ @UNIT@ завеÑÑил пÑоÑеÑÑ Ð¿ÐµÑеÑиÑÑÐ²Ð°Ð½Ð¸Ñ Ñвоей конÑигÑÑаÑии.
-
-РезÑлÑÑаÑ: @RESULT at .
-
-# Subject: Process @EXECUTABLE@ could not be executed
--- 641257651c1b4ec9a8624d7a40a9e1e7 ru
-Subject: Ðе ÑдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑÑ Ð¿ÑоÑеÑÑ @EXECUTABLE@
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Сбой: не ÑдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑÑ Ð¿ÑоÑеÑÑ @EXECUTABLE at .
-
-Ðод оÑибки: @ERRNO at .
-
-# Subject: One or more messages could not be forwarded to syslog
--- 0027229ca0644181a76c4e92458afa2e ru
-Subject: ЧаÑÑÑ ÑообÑений не ÑдалоÑÑ Ð¿ÐµÑедаÑÑ Ð¿ÑоÑеÑÑÑ syslog
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-Ðе ÑдалоÑÑ Ð¿ÐµÑедаÑÑ Ð½ÐµÐºÐ¾ÑоÑÑе ÑообÑÐµÐ½Ð¸Ñ Ð´ÐµÐ¼Ð¾Ð½Ñ ÑиÑÑемного лога (syslog),
-дÑблиÑÑÑÑÐµÐ¼Ñ ÑабоÑÑ ÑлÑÐ¶Ð±Ñ ÑиÑÑемного жÑÑнала. СкоÑее вÑего, пÑиÑина в Ñом, ÑÑо
-иÑполÑзÑÐµÐ¼Ð°Ñ ÑеализаÑÐ¸Ñ syslog не ÑÑÐ¿ÐµÐ²Ð°ÐµÑ Ð¾Ð±ÑабаÑÑваÑÑ ÑообÑÐµÐ½Ð¸Ñ Ñ Ð´Ð¾ÑÑаÑоÑной
-ÑкоÑоÑÑÑÑ.
-
-# Subject: Mount point is not empty
--- 1dee0369c7fc4736b7099b38ecb46ee7 ru
-Subject: ÐаÑалог, ÑвлÑÑÑийÑÑ ÑоÑкой монÑиÑованиÑ, не пÑÑÑ
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐаÑалог @WHERE@, коÑоÑÑй бÑл Ñказан в каÑеÑÑве ÑоÑки монÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ (во вÑоÑом
-ÑÑолбÑе Ñайла /etc/fstab, либо в паÑамеÑÑе Where= Ñайла конÑигÑÑаÑии ÑниÑа),
-не ÑвлÑеÑÑÑ Ð¿ÑÑÑÑм. ÐÑо никак не меÑÐ°ÐµÑ Ð¼Ð¾Ð½ÑиÑованиÑ, однако Ñанее наÑ
одивÑиеÑÑ
-в нем ÑÐ°Ð¹Ð»Ñ Ð±ÑдÑÑ Ð½ÐµÐ´Ð¾ÑÑÑпнÑ. ЧÑÐ¾Ð±Ñ Ð¿Ð¾Ð»ÑÑиÑÑ Ðº ним доÑÑÑп, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе вÑÑÑнÑÑ
-пеÑемонÑиÑоваÑÑ Ð½Ð¸Ð¶ÐµÐ»ÐµÐ¶Ð°ÑÑÑ ÑайловÑÑ ÑиÑÑÐµÐ¼Ñ Ð² дÑÑгÑÑ ÑоÑкÑ.
-
-# Subject: A virtual machine or container has been started
--- 24d8d4452573402496068381a6312df2 ru
-Subject: ÐапÑÑена виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина/конÑейнеÑ
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐиÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина @NAME@ (иденÑиÑикаÑÐ¾Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ пÑоÑеÑÑа: @LEADER@) запÑÑена и
-гоÑова к ÑабоÑе.
-
-# Subject: A virtual machine or container has been terminated
--- 58432bd3bace477cb514b56381b8a758 ru
-Subject: ÐÑÑановлена виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина/конÑейнеÑ
-Defined-By: systemd
-Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-
-ÐиÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина @NAME@ (иденÑиÑикаÑÐ¾Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ пÑоÑеÑÑа: @LEADER@) вÑклÑÑена.
diff --git a/catalog/systemd.fr.catalog b/catalog/systemd.fr.catalog
new file mode 100644
index 0000000..3524562
--- /dev/null
+++ b/catalog/systemd.fr.catalog
@@ -0,0 +1,260 @@
+# This file is part of systemd.
+#
+# Copyright 2012 Lennart Poettering
+# Copyright 2013 Sylvain Plantefève
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+# Message catalog for systemd's own messages
+# French translation
+
+# Le format du catalogue de messages est décrit (en anglais) içi :
+# http://www.freedesktop.org/wiki/Software/systemd/catalog
+
+-- f77379a8490b408bbe5f6940505a777b
+Subject: Le Journal a été démarré
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Le processus du journal système a démarré, ouvert ses fichiers en écriture
+et est prêt à traiter les requêtes.
+
+-- d93fb3c9c24d451a97cea615ce59c00b
+Subject: Le Journal a été arrêté
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Le processus du journal système a été arrêté et tous ses fichiers actifs
+ont été fermés.
+
+-- a596d6fe7bfa4994828e72309e95d61e
+Subject: Des messages d'un service ont été supprimés
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: man:journald.conf(5)
+
+Un service a essayé d'enregistrer un trop grand nombre de messages sur un
+intervalle de temps donné. Des messages de ce service ont été évincés.
+
+Notez que seuls des messages de ce service ont été évincés, les messages des
+autres services ne sont pas affectés.
+
+Les limites définissant ce comportement peuvent être configurées avec les
+paramètres RateLimitInterval= et RateLimitBurst= dans le fichier
+/etc/systemd/journald.conf. Voir journald.conf(5) pour plus de détails.
+
+-- e9bf28e6e834481bb6f48f548ad13606
+Subject: Des messages du Journal ont été manqués
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Des messages du noyau ont été manqués car le journal système n'a pas été
+capable de les traiter suffisament vite.
+
+-- fc2e22bc6ee647b6b90729ab34a250b1
+Subject: Le processus @COREDUMP_PID@ (@COREDUMP_COMM@) a généré un fichier « core »
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: man:core(5)
+
+Le processus @COREDUMP_PID@ (@COREDUMP_COMM@) a planté et généré un fichier « core ».
+
+Cela indique généralement une erreur de programmation dans le programme
+incriminé, et cela devrait être notifié à son concepteur comme un défaut (bug).
+
+-- 8d45620c1a4348dbb17410da57c60c66
+Subject: Une nouvelle session @SESSION_ID@ a été créée pour l'utilisateur @USER_ID@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+Une nouvelle session a été créée pour l'utilisateur @USER_ID@ avec
+l'identifiant (ID) @SESSION_ID at .
+
+Le processus maître de la session est @LEADER at .
+
+-- 3354939424b4456d9802ca8333ed424a
+Subject: La session @SESSION_ID@ s'est terminée
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+La session d'identifiant (ID) @SESSION_ID@ s'est terminée.
+
+-- fcbefc5da23d428093f97c82a9290f7b
+Subject: Un nouveau poste (seat) @SEAT_ID@ est disponible
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+Un nouveau poste (seat) @SEAT_ID@ a été configuré et est maintenant disponible.
+
+-- e7852bfe46784ed0accde04bc864c2d5
+Subject: Le poste (seat) @SEAT_ID@ a été retiré
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+Le poste (seat) @SEAT_ID@ a été retiré et n'est plus disponible.
+
+-- c7a787079b354eaaa9e77b371893cd27
+Subject: Changement d'heure
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'horloge système a été modifiée et positionnée à @REALTIME@ microsecondes
+après le 1er janvier 1970.
+
+-- 45f82f4aef7a4bbf942ce861d1f20990
+Subject: Fuseau horaire modifié en @TIMEZONE@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Le fuseau horaire du système a été modifié et positionné à @TIMEZONE at .
+
+-- b07a249cd024414a82dd00cd181378ff
+Subject: Le démarrage du système est terminé
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Tous les services nécessaires au démarrage du système ont été lancés avec
+succès. Notez que cela ne signifie pas que le système est maintenant au
+repos, car des services peuvent encore être en train de terminer leur
+démarrage.
+
+Le chargement du noyau a nécessité @KERNEL_USEC@ microsecondes.
+
+Le chargement du « RAM disk » initial a nécessité @INITRD_USEC@ microsecondes.
+
+Le chargement de l'espace utilisateur a nécessité @USERSPACE_USEC@ microsecondes.
+
+-- 6bbd95ee977941e497c48be27c254128
+Subject: Le système entre dans l'état de repos (sleep state) @SLEEP@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Le système est maintenant à l'état de repos (sleep state) @SLEEP at .
+
+-- 8811e6df2a8e40f58a94cea26f8ebf14
+Subject: Le système sorti de l'état de repos (sleep state) @SLEEP@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Le système est maintenant sorti de l'état de repos (sleep state) @SLEEP at .
+
+-- 98268866d1d54a499c4e98921d93bc40
+Subject: Arrêt du système amorcé
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'arrêt du système a été amorcé. L'arrêt a maintenant commencé, tous les
+services du système sont terminés et tous les systèmes de fichiers sont
+démontés.
+
+-- 7d4958e842da4a758f6c1cdc7b36dcc5
+Subject: L'unité (unit) @UNIT@ a commencé à démarrer
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unité (unit) @UNIT@ a commencé à démarrer.
+
+-- 39f53479d3a045ac8e11786248231fbf
+Subject: L'unité (unit) @UNIT@ a terminé son démarrage
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unité (unit) @UNIT@ a terminé son démarrage, avec le résultat @RESULT at .
+
+-- de5b426a63be47a7b6ac3eaac82e2f6f
+Subject: L'unité (unit) @UNIT@ a commencé à s'arrêter
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unité (unit) @UNIT@ a commencé à s'arrêter.
+
+-- 9d1aaa27d60140bd96365438aad20286
+Subject: L'unité (unit) @UNIT@ a terminé son arrêt
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unité (unit) @UNIT@ a terminé son arrêt.
+
+-- be02cf6855d2428ba40df7e9d022f03d
+Subject: L'unité (unit) @UNIT@ a échoué
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unité (unit) @UNIT@ a échoué, avec le résultat @RESULT at .
+
+-- d34d037fff1847e6ae669a370e694725
+Subject: L'unité (unit) @UNIT@ a commencé à recharger sa configuration
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unité (unit) @UNIT@ a commencé à recharger sa configuration.
+
+-- 7b05ebc668384222baa8881179cfda54
+Subject: L'unité (unit) @UNIT@ a terminé de recharger configuration
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unité (unit) @UNIT@ a terminé de recharger configuration,
+avec le résultat @RESULT at .
+
+-- 641257651c1b4ec9a8624d7a40a9e1e7
+Subject: Le processus @EXECUTABLE@ n'a pas pu être exécuté
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Le processus @EXECUTABLE@ n'a pas pu être exécuté, et a donc echoué.
+
+Le code d'erreur renvoyé est @ERRNO at .
+
+-- 0027229ca0644181a76c4e92458afa2e
+Subject: Un ou plusieurs messages n'ont pas pu être transmis à syslog
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Un ou plusieurs messages n'ont pas pu être transmis au service syslog
+s'exécutant conjointement avec journald. Cela indique généralement que
+l'implémentation de syslog utilisée n'a pas été capable de suivre la cadence
+du flux de messages.
+
+-- 1dee0369c7fc4736b7099b38ecb46ee7
+Subject: Le point de montage n'est pas vide
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Le répertoire @WHERE@ est spécifié comme point de montage (second champ du
+fichier /etc/fstab, ou champ Where= dans une unité (unit) systemd) et n'est pas
+vide.
+Cela ne perturbe pas le montage du système de fichiers, mais les fichiers
+préalablement présents dans ce répertoire sont devenus inaccessibles.
+Pour atteindre ces fichiers, veuillez monter manuellement le système de
+fichiers sous-jacent à un autre emplacement.
+
+-- 24d8d4452573402496068381a6312df2
+Subject: Une machine virtuelle ou un conteneur (container) a été démarré
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+La machine virtuelle @NAME@ a été démarrée avec le PID maître @LEADER@,
+et est maintenant prête à l'emploi.
+
+-- 58432bd3bace477cb514b56381b8a758
+Subject: Une machine virtuelle ou un conteneur (container) a été arrêté
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+La machine virtuelle @NAME@ avec le PID maître @LEADER@ a été arrêtée.
diff --git a/catalog/systemd.it.catalog b/catalog/systemd.it.catalog
new file mode 100644
index 0000000..861b92b
--- /dev/null
+++ b/catalog/systemd.it.catalog
@@ -0,0 +1,254 @@
+# This file is part of systemd.
+#
+# Copyright 2013 Daniele Medri
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+# Message catalog for systemd's own messages
+
+-- f77379a8490b408bbe5f6940505a777b
+Subject: Il registro è stato avviato
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Il processo relativo al registro di sistema è stato avviato, ha aperto i
+file in scrittura ed è ora pronto a gestire richieste.
+
+-- d93fb3c9c24d451a97cea615ce59c00b
+Subject: Il registro è stato terminato
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Il processo relativo al registro di sistema è stato terminato e ha chiuso
+tutti i file attivi.
+
+-- a596d6fe7bfa4994828e72309e95d61e
+Subject: I messaggi di un servizio sono stati soppressi
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: man:journald.conf(5)
+
+Un servizio ha registrato troppi messaggi in un dato periodo di tempo.
+I messaggi del servizio sono stati eliminati.
+
+Solo i messaggi del servizio indicato sono stati
+eliminati, i messaggi degli altri servizi rimangono invariati.
+
+I limiti oltre i quali i messaggi si eliminano si configurano
+con RateLimitInterval= e RateLimitBurst= in
+/etc/systemd/journald.conf. Vedi journald.conf(5) per maggiori informazioni.
+
+-- e9bf28e6e834481bb6f48f548ad13606
+Subject: I messaggi di un servizio sono stati perduti
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+I messaggi del kernel sono stati perduti perché, il registro di sistema
+non è stato in grado di gestirli abbastanza velocemente.
+
+-- fc2e22bc6ee647b6b90729ab34a250b1
+Subject: Il processo @COREDUMP_PID@ (@COREDUMP_COMM@) ha generato un dump.
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: man:core(5)
+
+Il processo @COREDUMP_PID@ (@COREDUMP_COMM@) si è bloccato generando un dump.
+
+Questo di solito capita per un errore di programmazione nell'applicazione e
+dovrebbe essere segnalato al vendor come un bug.
+
+-- 8d45620c1a4348dbb17410da57c60c66
+Subject: La nuova sessione @SESSION_ID@ è stata creata per l'utente @USER_ID@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+Una nuova sessione con ID @SESSION_ID@ è stata creata per l'utente @USER_ID at .
+
+Il processo primario della sessione è @LEADER at .
+
+-- 3354939424b4456d9802ca8333ed424a
+Subject: La sessione @SESSION_ID@ è terminata
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+La sessione con ID @SESSION_ID@ è terminata.
+
+-- fcbefc5da23d428093f97c82a9290f7b
+Subject: La nuova postazione @SEAT_ID@ è ora disponibile
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+La nuova postazione @SEAT_ID@ è stata configurata ed è ora disponibile.
+
+-- e7852bfe46784ed0accde04bc864c2d5
+Subject: La postazione @SEAT_ID@ è stata rimossa
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+La postazione @SEAT_ID@ è stata rimossa e non è più disponibile.
+
+-- c7a787079b354eaaa9e77b371893cd27
+Subject: Cambio d'orario
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'orologio di sistema è cambiato in @REALTIME@ microsecondi dal 1 gennaio, 1970.
+
+-- 45f82f4aef7a4bbf942ce861d1f20990
+Subject: Il fuso orario è cambiato in @TIMEZONE@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Il fuso orario di sistema è cambiato in @TIMEZONE at .
+
+-- b07a249cd024414a82dd00cd181378ff
+Subject: Avvio del sistema completato.
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Tutti i servizi di sistema richiesti per la fase di avvio sono stati eseguiti
+con successo. Nota che la macchina potrebbe non essere ancora pronta in quanto
+i servizi attivati sono in fase di completamento.
+
+L'avvio del kernel ha richiesto @KERNEL_USEC@ microsecondi.
+
+L'avvio del disco RAM ha richiesto @INITRD_USEC@ microsecondi.
+
+L'avvio dello userspace ha richiesto @USERSPACE_USEC@ microsecondi.
+
+-- 6bbd95ee977941e497c48be27c254128
+Subject: Il sistema è entrato in fase di pausa @SLEEP@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Il sistema è entrato nello stato di pausa @SLEEP at .
+
+-- 8811e6df2a8e40f58a94cea26f8ebf14
+Subject: Il sistema è uscito dalla fase di pausa @SLEEP@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Il sistema è uscito dallo stato di pausa @SLEEP at .
+
+-- 98268866d1d54a499c4e98921d93bc40
+Subject: Il sistema è in fase di spegnimento
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Systemd è in fase di spegnimento. Tutti i servizi di sistema
+saranno terminati e tutti i file systems smontati.
+
+-- 7d4958e842da4a758f6c1cdc7b36dcc5
+Subject: L'unità @UNIT@ inizia la fase di avvio
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unità @UNIT@ ha iniziato la fase di avvio.
+
+-- 39f53479d3a045ac8e11786248231fbf
+Subject: L'unità @UNIT@ termina la fase di avvio
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unità @UNIT@ ha terminato la fase di avvio.
+
+La fase di avvio è @RESULT at .
+
+-- de5b426a63be47a7b6ac3eaac82e2f6f
+Subject: L'unità @UNIT@ inizia la fase di spegnimento
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unità @UNIT@ ha iniziato la fase di spegnimento.
+
+-- 9d1aaa27d60140bd96365438aad20286
+Subject: L'unità @UNIT@ termina la fase di spegnimento
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unità @UNIT@ ha terminato la fase di spegnimento.
+
+-- be02cf6855d2428ba40df7e9d022f03d
+Subject: L'unità @UNIT@ è fallita
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unità @UNIT@ è fallita.
+
+Il risultato è @RESULT at .
+
+-- d34d037fff1847e6ae669a370e694725
+Subject: L'unità @UNIT@ inizia a caricare la propria configurazione
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unità @UNIT@ è iniziata ricaricando la propria configurazione
+
+-- 7b05ebc668384222baa8881179cfda54
+Subject: L'unità @UNIT@ termina il caricamento della propria configurazione
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+L'unità @UNIT@ è terminata ricaricando la propria configurazione
+
+Il risultato è @RESULT at .
+
+-- 641257651c1b4ec9a8624d7a40a9e1e7
+Subject: Il processo @EXECUTABLE@ non può essere eseguito
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Il processo @EXECUTABLE@ non può essere eseguito e termina.
+
+Il numero di errore restituito durante l'esecuzione del processo è @ERRNO at .
+
+-- 0027229ca0644181a76c4e92458afa2e
+Subject: Uno o più messaggi non possono essere inoltrati a syslog
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Uno o più messaggi non possono essere inviati al servizio syslog
+eseguito in parallelo a journald. Questo di solito capita perché,
+l'implementazione di syslog non sta al passo con la
+velocità dei messaggi accodati.
+
+-- 1dee0369c7fc4736b7099b38ecb46ee7
+Subject: Il punto di montaggio non è vuoto
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+La directory @WHERE@ è specificata come punto di montaggio (secondo campo
+in /etc/fstab o nel campo Where= del file unità di systemd) e non è vuoto.
+Questo non interferisce con il montaggio, ma i file pre-esistenti in questa
+directory diventano inaccessibili. Per visualizzare i file, si suggerisce
+di montare manualmente il file system indicato in una posizione secondaria.
+
+-- 24d8d4452573402496068381a6312df2
+Subject: Avviata macchina virtuale o container
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+La macchina virtuale @NAME@ con PID primario @LEADER@ è stata
+avviata ed è pronta all'uso.
+
+-- 58432bd3bace477cb514b56381b8a758
+Subject: Terminata macchina virtuale o container
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+La macchina virtuale @NAME@ con PID primario @LEADER@ è stata spenta.
diff --git a/catalog/systemd.ru.catalog b/catalog/systemd.ru.catalog
new file mode 100644
index 0000000..f995324
--- /dev/null
+++ b/catalog/systemd.ru.catalog
@@ -0,0 +1,294 @@
+# This file is part of systemd.
+#
+# Copyright 2012 Lennart Poettering
+# Copyright 2013 Sergey Ptashnick
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+# Message catalog for systemd's own messages
+# Russian translation
+
+# ФоÑÐ¼Ð°Ñ ÐºÐ°Ñалога ÑообÑений опиÑан по ÑÑÑлке
+# http://www.freedesktop.org/wiki/Software/systemd/catalog
+
+# ÐеÑед каждÑм ÑлеменÑом в комменÑаÑии Ñказан Subject иÑÑ
одного
+# ÑообÑÐµÐ½Ð¸Ñ (на английÑком).
+
+# Subject: The Journal has been started
+-- f77379a8490b408bbe5f6940505a777b
+Subject: ÐапÑÑена ÑлÑжба жÑÑналиÑованиÑ
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐÑоÑеÑÑ, оÑвеÑаÑÑий за жÑÑналиÑование ÑиÑÑемнÑÑ
ÑобÑÑий, ÑÑпеÑно запÑÑÑилÑÑ,
+оÑкÑÑл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи ÑÐ°Ð¹Ð»Ñ Ð¶ÑÑнала, и гоÑов обÑабаÑÑваÑÑ Ð·Ð°Ð¿ÑоÑÑ.
+
+# Subject: The Journal has been stopped
+-- d93fb3c9c24d451a97cea615ce59c00b
+Subject: СлÑжба жÑÑналиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑÑановлена
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐÑоÑеÑÑ, оÑвеÑаÑÑий за жÑÑналиÑование ÑиÑÑемнÑÑ
ÑобÑÑий, завеÑÑил ÑабоÑÑ Ð¸
+закÑÑл вÑе Ñвои ÑайлÑ.
+
+# Subject: Messages from a service have been suppressed
+-- a596d6fe7bfa4994828e72309e95d61e
+Subject: ЧаÑÑÑ ÑообÑений Ð¾Ñ ÑлÑÐ¶Ð±Ñ Ð¿ÑопÑÑена
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: man:journald.conf(5)
+
+СлÑжба оÑпÑавила ÑлиÑком много ÑообÑений за коÑоÑкий пÑомежÑÑок вÑемени.
+ЧаÑÑÑ ÑообÑений бÑла пÑопÑÑена.
+
+ÐбÑаÑиÑе внимание, ÑÑо бÑли пÑопÑÑÐµÐ½Ñ ÑообÑÐµÐ½Ð¸Ñ ÑолÑко Ð¾Ñ ÑÑой ÑлÑжбÑ,
+ÑообÑÐµÐ½Ð¸Ñ Ð´ÑÑгиÑ
ÑлÑжб не заÑÑонÑÑÑ.
+
+ÐÑедел, поÑле коÑоÑого ÑлÑжба жÑÑнала наÑÐ¸Ð½Ð°ÐµÑ Ð¸Ð³Ð½Ð¾ÑиÑоваÑÑ ÑообÑениÑ,
+наÑÑÑаиваеÑÑÑ Ð¿Ð°ÑамеÑÑами RateLimitInterval= и RateLimitBurst= в Ñайле
+/etc/systemd/journald.conf. ÐодÑобноÑÑи ÑмоÑÑиÑе на ÑÑÑаниÑе ÑÑководÑÑва
+journald.conf(5).
+
+# Subject: Journal messages have been missed
+-- e9bf28e6e834481bb6f48f548ad13606
+Subject: ЧаÑÑÑ ÑообÑений ÑдÑа пÑопÑÑена
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ЧаÑÑÑ ÑообÑений, поÑÑÑпивÑиÑ
Ð¾Ñ ÑдÑа, бÑла поÑеÑÑна, Ñак как ÑлÑжба
+жÑÑналиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ ÑÑпела иÑ
обÑабоÑаÑÑ.
+
+# Subject: Process @COREDUMP_PID@ (@COREDUMP_COMM@) dumped core
+-- fc2e22bc6ee647b6b90729ab34a250b1
+Subject: ÐÑоÑеÑÑ @COREDUMP_PID@ (@COREDUMP_COMM@) ÑбÑоÑил дамп памÑÑи
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: man:core(5)
+
+ÐÑоÑеÑÑ @COREDUMP_PID@ (@COREDUMP_COMM@) завеÑÑилÑÑ Ð¸Ð·-за кÑиÑиÑеÑкой оÑибки.
+ÐапиÑан дамп памÑÑи.
+
+ÐеÑоÑÑно, ÑÑо пÑоизоÑло из-за оÑибки, допÑÑенной в коде пÑогÑаммÑ.
+РекомендÑеÑÑÑ ÑообÑиÑÑ ÐµÐµ ÑазÑабоÑÑикам о возникÑей пÑоблеме.
+
+# Subject: A new session @SESSION_ID@ has been created for user @USER_ID@
+-- 8d45620c1a4348dbb17410da57c60c66
+Subject: ÐÐ»Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ @USER_ID@ Ñоздан новÑй ÑÐµÐ°Ð½Ñ @SESSION_ID@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+ÐÐ»Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ @USER_ID@ Ñоздан новÑй ÑÐµÐ°Ð½Ñ Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом @SESSION_ID at .
+
+ÐлавнÑй пÑоÑеÑÑ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑеанÑа Ð¸Ð¼ÐµÐµÑ Ð¸Ð½Ð´ÐµÐ½ÑиÑикаÑÐ¾Ñ @LEADER at .
+
+# Subject: A session @SESSION_ID@ has been terminated
+-- 3354939424b4456d9802ca8333ed424a
+Subject: Ð¡ÐµÐ°Ð½Ñ @SESSION_ID@ завеÑÑен
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+Ð¡ÐµÐ°Ð½Ñ Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом @SESSION_ID@ завеÑÑилÑÑ.
+
+# Subject: A new seat @SEAT_ID@ is now available
+-- fcbefc5da23d428093f97c82a9290f7b
+Subject: Ðобавлено новое ÑабоÑее меÑÑо @SEAT_ID@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+Ðовое ÑабоÑее меÑÑо (seat) @SEAT_ID@ полноÑÑÑÑ Ð½Ð°ÑÑÑоено и гоÑово к
+иÑполÑзованиÑ.
+
+# Subject: A seat @SEAT_ID@ has now been removed
+-- e7852bfe46784ed0accde04bc864c2d5
+Subject: РабоÑее меÑÑо @SEAT_ID@ оÑклÑÑено
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+
+РабоÑее меÑÑо (seat) @SEAT_ID@ бÑло оÑклÑÑено.
+
+# Subject: Time change
+-- c7a787079b354eaaa9e77b371893cd27
+Subject: ÐеÑÐµÐ²ÐµÐ´ÐµÐ½Ñ ÑиÑÑемнÑе ÑаÑÑ
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+СиÑÑемнÑе ÑаÑÑ Ð±Ñли пеÑеведенÑ. СейÑÐ°Ñ Ð¾Ð½Ð¸ показÑваÑÑ @REALTIME@ микÑоÑекÑнд
+Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñа 00:00:00 1 ÑнваÑÑ 1970 года.
+
+# Subject: Time zone change to @TIMEZONE@
+-- 45f82f4aef7a4bbf942ce861d1f20990
+Subject: ЧаÑовой поÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ на @TIMEZONE@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+СиÑÑемнÑй ÑаÑовой поÑÑ Ð±Ñл изменен. Ðовое знаÑение: @TIMEZONE at .
+
+# Subject: System start-up is now complete
+-- b07a249cd024414a82dd00cd181378ff
+Subject: ÐапÑÑк ÑиÑÑÐµÐ¼Ñ Ð·Ð°Ð²ÐµÑÑен
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐÑе ÑиÑÑемнÑе ÑлÑжбÑ, запÑÑк коÑоÑÑÑ
пÑедпиÑан наÑÑÑойками, бÑли запÑÑенÑ.
+ÐпÑоÑем, ÑÑо еÑе не ознаÑаеÑ, ÑÑо ÑиÑÑема в даннÑй Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ð¸Ñем не занÑÑа,
+Ñак как некоÑоÑÑе ÑлÑÐ¶Ð±Ñ Ð¼Ð¾Ð³ÑÑ Ð¿ÑодолжаÑÑ Ð¸Ð½Ð¸ÑиализаÑÐ¸Ñ Ð´Ð°Ð¶Ðµ поÑле Ñого, как
+оÑÑиÑалиÑÑ Ð¾ Ñвоем запÑÑке.
+
+ÐапÑÑк ÑдÑа занÑл @KERNEL_USEC@ микÑоÑекÑнд.
+
+ÐÑоÑеÑÑÑ Ð½Ð°ÑалÑного RAM-диÑка (initrd) оÑÑабоÑали за @INITRD_USEC@ микÑоÑекÑнд.
+
+ÐапÑÑк ÑиÑÑемнÑÑ
ÑлÑжб занÑл @USERSPACE_USEC@ микÑоÑекÑнд.
+
+# Subject: System sleep state @SLEEP@ entered
+-- 6bbd95ee977941e497c48be27c254128
+Subject: СиÑÑема пеÑеÑла в ÑоÑÑоÑние Ñна (@SLEEP@)
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+СиÑÑема бÑла пеÑеведена в ÑоÑÑоÑние Ñна (@SLEEP@).
+
+# Subject: System sleep state @SLEEP@ left
+-- 8811e6df2a8e40f58a94cea26f8ebf14
+Subject: СиÑÑема вÑÑла из ÑоÑÑоÑÐ½Ð¸Ñ Ñна (@SLEEP@)
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+СиÑÑема бÑла вÑведена из ÑоÑÑоÑÐ½Ð¸Ñ Ñна (@SLEEP@).
+
+# Subject: System shutdown initiated
+-- 98268866d1d54a499c4e98921d93bc40
+Subject: ÐодгоÑовка ÑиÑÑÐµÐ¼Ñ Ðº вÑклÑÑениÑ
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐаÑÐ°Ñ Ð¿ÑоÑеÑÑ Ð¿Ð¾Ð´Ð³Ð¾Ñовки к вÑклÑÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑа. ÐÑÑанавливаÑÑÑÑ Ð²Ñе ÑиÑÑемнÑе
+ÑлÑжбÑ, оÑмонÑиÑÑÑÑÑÑ Ð²Ñе ÑайловÑе ÑиÑÑемÑ.
+
+# Subject: Unit @UNIT@ has begun with start-up
+-- 7d4958e842da4a758f6c1cdc7b36dcc5
+Subject: ÐаÑинаеÑÑÑ Ð·Ð°Ð¿ÑÑк ÑниÑа @UNIT@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐаÑÐ°Ñ Ð¿ÑоÑеÑÑ Ð·Ð°Ð¿ÑÑка ÑниÑа @UNIT at .
+
+# Subject: Unit @UNIT@ has finished start-up
+-- 39f53479d3a045ac8e11786248231fbf
+Subject: ÐапÑÑк ÑниÑа @UNIT@ завеÑÑен
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐÑоÑеÑÑ Ð·Ð°Ð¿ÑÑка ÑниÑа @UNIT@ бÑл завеÑÑен.
+
+РезÑлÑÑаÑ: @RESULT at .
+
+# Subject: Unit @UNIT@ has begun shutting down
+-- de5b426a63be47a7b6ac3eaac82e2f6f
+Subject: ÐаÑинаеÑÑÑ Ð¾ÑÑановка ÑниÑа @UNIT@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐаÑÐ°Ñ Ð¿ÑоÑеÑÑ Ð¾ÑÑановки ÑниÑа @UNIT at .
+
+# Subject: Unit @UNIT@ has finished shutting down
+-- 9d1aaa27d60140bd96365438aad20286
+Subject: ÐавеÑÑена оÑÑановка ÑниÑа @UNIT at .
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐÑоÑеÑÑ Ð¾ÑÑановки ÑниÑа @UNIT@ бÑл завеÑÑен.
+
+# Subject: Unit @UNIT@ has failed
+-- be02cf6855d2428ba40df7e9d022f03d
+Subject: ÐÑибка ÑниÑа @UNIT@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐÑоизоÑел Ñбой ÑниÑа @UNIT at .
+
+РезÑлÑÑаÑ: @RESULT at .
+
+# Subject: Unit @UNIT@ has begun with reloading its configuration
+-- d34d037fff1847e6ae669a370e694725
+Subject: Ð®Ð½Ð¸Ñ @UNIT@ наÑал пеÑеÑиÑÑваÑÑ Ñвои наÑÑÑойки
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Ð®Ð½Ð¸Ñ @UNIT@ наÑал пÑоÑеÑÑ Ð¿ÐµÑеÑиÑÑÐ²Ð°Ð½Ð¸Ñ Ñвоей конÑигÑÑаÑии.
+
+# Subject: Unit @UNIT@ has finished reloading its configuration
+-- 7b05ebc668384222baa8881179cfda54
+Subject: Ð®Ð½Ð¸Ñ @UNIT@ завеÑÑил пеÑеÑиÑÑвание ÑвоиÑ
наÑÑÑоек
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Ð®Ð½Ð¸Ñ @UNIT@ завеÑÑил пÑоÑеÑÑ Ð¿ÐµÑеÑиÑÑÐ²Ð°Ð½Ð¸Ñ Ñвоей конÑигÑÑаÑии.
+
+РезÑлÑÑаÑ: @RESULT at .
+
+# Subject: Process @EXECUTABLE@ could not be executed
+-- 641257651c1b4ec9a8624d7a40a9e1e7
+Subject: Ðе ÑдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑÑ Ð¿ÑоÑеÑÑ @EXECUTABLE@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Сбой: не ÑдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑÑ Ð¿ÑоÑеÑÑ @EXECUTABLE at .
+
+Ðод оÑибки: @ERRNO at .
+
+# Subject: One or more messages could not be forwarded to syslog
+-- 0027229ca0644181a76c4e92458afa2e
+Subject: ЧаÑÑÑ ÑообÑений не ÑдалоÑÑ Ð¿ÐµÑедаÑÑ Ð¿ÑоÑеÑÑÑ syslog
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+Ðе ÑдалоÑÑ Ð¿ÐµÑедаÑÑ Ð½ÐµÐºÐ¾ÑоÑÑе ÑообÑÐµÐ½Ð¸Ñ Ð´ÐµÐ¼Ð¾Ð½Ñ ÑиÑÑемного лога (syslog),
+дÑблиÑÑÑÑÐµÐ¼Ñ ÑабоÑÑ ÑлÑÐ¶Ð±Ñ ÑиÑÑемного жÑÑнала. СкоÑее вÑего, пÑиÑина в Ñом, ÑÑо
+иÑполÑзÑÐµÐ¼Ð°Ñ ÑеализаÑÐ¸Ñ syslog не ÑÑÐ¿ÐµÐ²Ð°ÐµÑ Ð¾Ð±ÑабаÑÑваÑÑ ÑообÑÐµÐ½Ð¸Ñ Ñ Ð´Ð¾ÑÑаÑоÑной
+ÑкоÑоÑÑÑÑ.
+
+# Subject: Mount point is not empty
+-- 1dee0369c7fc4736b7099b38ecb46ee7
+Subject: ÐаÑалог, ÑвлÑÑÑийÑÑ ÑоÑкой монÑиÑованиÑ, не пÑÑÑ
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐаÑалог @WHERE@, коÑоÑÑй бÑл Ñказан в каÑеÑÑве ÑоÑки монÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ (во вÑоÑом
+ÑÑолбÑе Ñайла /etc/fstab, либо в паÑамеÑÑе Where= Ñайла конÑигÑÑаÑии ÑниÑа),
+не ÑвлÑеÑÑÑ Ð¿ÑÑÑÑм. ÐÑо никак не меÑÐ°ÐµÑ Ð¼Ð¾Ð½ÑиÑованиÑ, однако Ñанее наÑ
одивÑиеÑÑ
+в нем ÑÐ°Ð¹Ð»Ñ Ð±ÑдÑÑ Ð½ÐµÐ´Ð¾ÑÑÑпнÑ. ЧÑÐ¾Ð±Ñ Ð¿Ð¾Ð»ÑÑиÑÑ Ðº ним доÑÑÑп, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе вÑÑÑнÑÑ
+пеÑемонÑиÑоваÑÑ Ð½Ð¸Ð¶ÐµÐ»ÐµÐ¶Ð°ÑÑÑ ÑайловÑÑ ÑиÑÑÐµÐ¼Ñ Ð² дÑÑгÑÑ ÑоÑкÑ.
+
+# Subject: A virtual machine or container has been started
+-- 24d8d4452573402496068381a6312df2
+Subject: ÐапÑÑена виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина/конÑейнеÑ
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐиÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина @NAME@ (иденÑиÑикаÑÐ¾Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ пÑоÑеÑÑа: @LEADER@) запÑÑена и
+гоÑова к ÑабоÑе.
+
+# Subject: A virtual machine or container has been terminated
+-- 58432bd3bace477cb514b56381b8a758
+Subject: ÐÑÑановлена виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина/конÑейнеÑ
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+
+ÐиÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина @NAME@ (иденÑиÑикаÑÐ¾Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ пÑоÑеÑÑа: @LEADER@) вÑклÑÑена.
commit c7332b0844e28d9b70c3c763b929f105c1056fe8
Author: Zbigniew JÄdrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Mon Dec 2 21:35:31 2013 -0500
catalog: determine language from the filename
diff --git a/TODO b/TODO
index 20a9a07..6773604 100644
--- a/TODO
+++ b/TODO
@@ -217,11 +217,6 @@ Features:
* think about window-manager-run-as-user-service problem: exit 0 â activate shutdown.target; exit != 0 â restart service
-* msgcatalog determine default language of entries from the catalog
- file name. i.e. foobar.de_DE.catalog would set the default entry
- name for the entries to de_DE if they aren't explicitly suffixed
- individually.
-
* use "log level" rather than "log priority" everywhere
* timedate: have global on/off switches for auto-time (NTP), and auto-timezone that connman can subscribe to.
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 90ca008..2be81aa 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -125,7 +125,10 @@ static int finish_item(
return log_oom();
i->id = id;
- strscpy(i->language, sizeof(i->language), language);
+ if (language) {
+ assert(strlen(language) > 1 && strlen(language) < 32);
+ strcpy(i->language, language);
+ }
i->offset = htole64((uint64_t) offset);
r = hashmap_put(h, i, i);
@@ -139,12 +142,34 @@ static int finish_item(
return 0;
}
+int catalog_file_lang(const char* filename, char **lang) {
+ char *beg, *end, *_lang;
+
+ end = endswith(filename, ".catalog");
+ if (!end)
+ return 0;
+
+ beg = end - 1;
+ while (beg > filename && *beg != '.')
+ beg --;
+
+ if (beg <= filename || end <= beg + 1 || end - beg > 32)
+ return 0;
+
+ _lang = strndup(beg + 1, end - beg - 1);
+ if (!_lang)
+ return -ENOMEM;
+
+ *lang = _lang;
+ return 1;
+}
+
int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *payload = NULL;
unsigned n = 0;
sd_id128_t id;
- char language[32];
+ _cleanup_free_ char *deflang = NULL, *lang = NULL;
bool got_id = false, empty_line = true;
int r;
@@ -158,6 +183,12 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
return -errno;
}
+ r = catalog_file_lang(path, &deflang);
+ if (r < 0)
+ log_error("Failed to determine language for file %s: %m", path);
+ if (r == 1)
+ log_debug("File %s has language %s.", path, deflang);
+
for (;;) {
char line[LINE_MAX];
size_t a, b, c;
@@ -201,9 +232,12 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
if (sd_id128_from_string(line + 2 + 1, &jd) >= 0) {
if (got_id) {
- r = finish_item(h, sb, id, language, payload);
+ r = finish_item(h, sb, id, lang ?: deflang, payload);
if (r < 0)
return r;
+
+ free(lang);
+ lang = NULL;
}
if (with_language) {
@@ -214,14 +248,21 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
log_error("[%s:%u] Language too short.", path, n);
return -EINVAL;
}
- if (c > sizeof(language) - 1) {
+ if (c > 31) {
log_error("[%s:%u] language too long.", path, n);
return -EINVAL;
}
- strscpy(language, sizeof(language), t);
- } else
- language[0] = '\0';
+ if (deflang) {
+ log_warning("[%s:%u] language %s", path, n,
+ streq(t, deflang) ?
+ "specified unnecessarily" :
+ "differs from default for file");
+ lang = strdup(t);
+ if (!lang)
+ return -ENOMEM;
+ }
+ }
got_id = true;
empty_line = false;
@@ -264,7 +305,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
}
if (got_id) {
- r = finish_item(h, sb, id, language, payload);
+ r = finish_item(h, sb, id, lang ?: deflang, payload);
if (r < 0)
return r;
}
diff --git a/src/journal/catalog.h b/src/journal/catalog.h
index 24a2d0b..5e15b99 100644
--- a/src/journal/catalog.h
+++ b/src/journal/catalog.h
@@ -34,4 +34,5 @@ int catalog_update(const char* database, const char* root, const char* const* di
int catalog_get(const char* database, sd_id128_t id, char **data);
int catalog_list(FILE *f, const char* database, bool oneline);
int catalog_list_items(FILE *f, const char* database, bool oneline, char **items);
+int catalog_file_lang(const char *filename, char **lang);
extern const char * const catalog_file_dirs[];
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index 5db5bed..863b9f4 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -120,6 +120,28 @@ static void test_catalog_update(void) {
assert(r >= 0);
}
+static void test_catalog_file_lang(void) {
+ _cleanup_free_ char *lang = NULL, *lang2 = NULL, *lang3 = NULL;
+
+ assert_se(catalog_file_lang("systemd.de_DE.catalog", &lang) == 1);
+ assert_se(streq(lang, "de_DE"));
+
+ assert_se(catalog_file_lang("systemd..catalog", &lang2) == 0);
+ assert_se(lang2 == NULL);
+
+ assert_se(catalog_file_lang("systemd.fr.catalog", &lang2) == 1);
+ assert_se(streq(lang2, "fr"));
+
+ assert_se(catalog_file_lang("systemd.fr.catalog.gz", &lang3) == 0);
+ assert_se(lang3 == NULL);
+
+ assert_se(catalog_file_lang("systemd.01234567890123456789012345678901.catalog", &lang3) == 0);
+ assert_se(lang3 == NULL);
+
+ assert_se(catalog_file_lang("systemd.0123456789012345678901234567890.catalog", &lang3) == 1);
+ assert_se(streq(lang3, "0123456789012345678901234567890"));
+}
+
int main(int argc, char *argv[]) {
_cleanup_free_ char *text = NULL;
int r;
@@ -144,5 +166,7 @@ int main(int argc, char *argv[]) {
if (database)
unlink(database);
+ test_catalog_file_lang();
+
return 0;
}
commit 6a371e23ee0e47827fb4e3aa469ed84da2599304
Author: Zbigniew JÄdrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Mon Dec 2 21:52:51 2013 -0500
systemd: treat reload failure as failure
systemctl reload "suceeded" on stopped units, but it is documented
to fail in this case.
https://bugzilla.redhat.com/show_bug.cgi?id=1036845
diff --git a/src/core/job.c b/src/core/job.c
index 557917a..ce97263 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -508,7 +508,7 @@ int job_run_and_invalidate(Job *j) {
else if (t == UNIT_ACTIVATING)
r = -EAGAIN;
else
- r = -ENOEXEC;
+ r = -EBADR;
break;
}
@@ -537,8 +537,10 @@ int job_run_and_invalidate(Job *j) {
if (j) {
if (r == -EALREADY)
r = job_finish_and_invalidate(j, JOB_DONE, true);
- else if (r == -ENOEXEC)
+ else if (r == -EBADR)
r = job_finish_and_invalidate(j, JOB_SKIPPED, true);
+ else if (r == -ENOEXEC)
+ r = job_finish_and_invalidate(j, JOB_INVALID, true);
else if (r == -EAGAIN) {
j->state = JOB_WAITING;
m->n_running_jobs--;
@@ -764,7 +766,7 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive) {
goto finish;
}
- if (result == JOB_FAILED)
+ if (result == JOB_FAILED || result == JOB_INVALID)
j->manager->n_failed_jobs ++;
job_uninstall(j);
@@ -1119,7 +1121,8 @@ static const char* const job_result_table[_JOB_RESULT_MAX] = {
[JOB_TIMEOUT] = "timeout",
[JOB_FAILED] = "failed",
[JOB_DEPENDENCY] = "dependency",
- [JOB_SKIPPED] = "skipped"
+ [JOB_SKIPPED] = "skipped",
+ [JOB_INVALID] = "invalid",
};
DEFINE_STRING_TABLE_LOOKUP(job_result, JobResult);
diff --git a/src/core/job.h b/src/core/job.h
index c23a380..0500e12 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -97,7 +97,8 @@ enum JobResult {
JOB_TIMEOUT, /* JobTimeout elapsed */
JOB_FAILED, /* Job failed */
JOB_DEPENDENCY, /* A required dependency job did not result in JOB_DONE */
- JOB_SKIPPED, /* JOB_RELOAD of inactive unit; negative result of JOB_VERIFY_ACTIVE */
+ JOB_SKIPPED, /* Negative result of JOB_VERIFY_ACTIVE */
+ JOB_INVALID, /* JOB_RELOAD of inactive unit */
_JOB_RESULT_MAX,
_JOB_RESULT_INVALID = -1
};
diff --git a/src/core/unit.c b/src/core/unit.c
index 50db86c..81d2162 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1301,8 +1301,11 @@ int unit_reload(Unit *u) {
if (state == UNIT_RELOADING)
return -EALREADY;
- if (state != UNIT_ACTIVE)
+ if (state != UNIT_ACTIVE) {
+ log_warning_unit(u->id, "Unit %s cannot be reloaded because it is inactive.",
+ u->id);
return -ENOEXEC;
+ }
following = unit_following(u);
if (following) {
More information about the systemd-commits
mailing list