Skip to content

Commit

Permalink
Merge branch 'bareos-16.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
fbergkemper committed Sep 6, 2016
2 parents 17d29ca + 03d3e0b commit df92c7a
Show file tree
Hide file tree
Showing 8 changed files with 1,570 additions and 1,511 deletions.
Binary file modified module/Application/language/fr_FR.mo
Binary file not shown.
1,584 changes: 802 additions & 782 deletions module/Application/language/fr_FR.po

Large diffs are not rendered by default.

Binary file modified module/Application/language/ru_RU.mo
Binary file not shown.
1,337 changes: 688 additions & 649 deletions module/Application/language/ru_RU.po

Large diffs are not rendered by default.

Binary file modified public/js/locale/fr_FR/LC_MESSAGES/fr_FR.mo
Binary file not shown.
102 changes: 51 additions & 51 deletions public/js/locale/fr_FR/LC_MESSAGES/fr_FR.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# Bruno Friedmann <bruno@ioda-net.ch>, 2016.
#
msgid ""
msgstr ""
Expand All @@ -20,27 +20,27 @@ msgstr ""

#: ../../js/datatables.functions.js:66
msgid "Backup"
msgstr ""
msgstr "Sauvegarde"

#: ../../js/datatables.functions.js:69
msgid "Migrated"
msgstr ""
msgstr "Migré"

#: ../../js/datatables.functions.js:72
msgid "Verify"
msgstr ""
msgstr "Vérification"

#: ../../js/datatables.functions.js:75
msgid "Restore"
msgstr ""
msgstr "Restauration"

#: ../../js/datatables.functions.js:78
msgid "Console program"
msgstr ""
msgstr "Program console"

#: ../../js/datatables.functions.js:81
msgid "Internal system job"
msgstr ""
msgstr "job système interne"

#: ../../js/datatables.functions.js:84
msgid "Admin"
Expand All @@ -52,185 +52,185 @@ msgstr ""

#: ../../js/datatables.functions.js:90
msgid "Copy of a job"
msgstr ""
msgstr "Copie d'un job"

#: ../../js/datatables.functions.js:93
msgid "Copy job"
msgstr ""
msgstr "Job de copie"

#: ../../js/datatables.functions.js:96
msgid "Migration job"
msgstr ""
msgstr "Job de migration"

#: ../../js/datatables.functions.js:99
msgid "Scan"
msgstr ""

#: ../../js/datatables.functions.js:111 ../../js/datatables.functions.js:150
msgid "Full"
msgstr ""
msgstr "Complet"

#: ../../js/datatables.functions.js:113
msgid "Differential"
msgstr ""
msgstr "Différentiel"

#: ../../js/datatables.functions.js:115
msgid "Incremental"
msgstr ""
msgstr "Incrémentiel"

#: ../../js/datatables.functions.js:117
msgid "VirtualFull"
msgstr ""
msgstr "Virtuel complet"

#: ../../js/datatables.functions.js:119
msgid "Base"
msgstr ""
msgstr "Base"

#: ../../js/datatables.functions.js:121
msgid "Catalog"
msgstr ""
msgstr "Catalogue"

#: ../../js/datatables.functions.js:123
msgid "InitCatalog"
msgstr ""
msgstr "Initialisation catalogue"

#: ../../js/datatables.functions.js:125
msgid "VolumeToCatalog"
msgstr ""
msgstr "Volume et catalogue"

#: ../../js/datatables.functions.js:127
msgid "DiskToCatalog"
msgstr ""
msgstr "Disque et catalogue"

#: ../../js/datatables.functions.js:129
msgid "Data"
msgstr ""
msgstr "Données"

#: ../../js/datatables.functions.js:131
msgid "None"
msgstr ""
msgstr "Aucun"

#: ../../js/datatables.functions.js:145 ../../js/datatables.functions.js:175
msgid "day(s)"
msgstr ""
msgstr "jour(s)"

#: ../../js/datatables.functions.js:150
msgid "Used"
msgstr ""
msgstr "Utilisé"

#: ../../js/datatables.functions.js:162
msgid "expired"
msgstr ""
msgstr "expiré"

#: ../../js/datatables.functions.js:166
msgid "expires in 1 day"
msgstr ""
msgstr "expire dans 1 jour"

#: ../../js/datatables.functions.js:170
msgid "expires in"
msgstr ""
msgstr "expire dans"

#: ../../js/datatables.functions.js:170
msgid "days"
msgstr ""
msgstr "jours"

#: ../../js/datatables.functions.js:181
msgid "never"
msgstr ""
msgstr "jamais"

#: ../../js/datatables.functions.js:190
msgid "today"
msgstr ""
msgstr "aujourd'hui"

#: ../../js/datatables.functions.js:193
msgid "day(s) ago"
msgstr ""
msgstr "jour(s) en arrière"

#: ../../js/datatables.functions.js:196
msgid "month(s) ago"
msgstr ""
msgstr "mois en arrière"

#: ../../js/datatables.functions.js:199
msgid "year(s) ago"
msgstr ""
msgstr "années en arrières"

#: ../../js/datatables.functions.js:232
msgid "enabled"
msgstr ""
msgstr "actif"

#: ../../js/datatables.functions.js:235
msgid "disabled"
msgstr ""
msgstr "inactif"

#: ../../js/datatables.functions.js:243
msgid "Yes"
msgstr ""
msgstr "Oui"

#: ../../js/datatables.functions.js:246
msgid "No"
msgstr ""
msgstr "Non"

#: ../../js/datatables.functions.js:256 ../../js/datatables.functions.js:260
#: ../../js/datatables.functions.js:264
msgid "Failure"
msgstr ""
msgstr "Erreur"

#: ../../js/datatables.functions.js:268
msgid "Success"
msgstr ""
msgstr "Succès"

#: ../../js/datatables.functions.js:272
msgid "Running"
msgstr ""
msgstr "En cours"

#: ../../js/datatables.functions.js:276
msgid "Queued"
msgstr ""
msgstr "En file d'attente"

#: ../../js/datatables.functions.js:280
msgid "Blocked"
msgstr ""
msgstr "Bloqué"

#: ../../js/datatables.functions.js:284
msgid "Verify found differences"
msgstr ""
msgstr "La vérification a trouvé des différences"

#: ../../js/datatables.functions.js:288
msgid "Canceled"
msgstr ""
msgstr "Annulé"

#: ../../js/datatables.functions.js:292 ../../js/datatables.functions.js:296
#: ../../js/datatables.functions.js:300 ../../js/datatables.functions.js:304
#: ../../js/datatables.functions.js:308 ../../js/datatables.functions.js:312
#: ../../js/datatables.functions.js:316 ../../js/datatables.functions.js:320
#: ../../js/datatables.functions.js:324 ../../js/datatables.functions.js:328
msgid "Waiting"
msgstr ""
msgstr "En attente"

#: ../../js/datatables.functions.js:332
msgid "SD despooling attributes"
msgstr ""
msgstr "SD envoi des attributs"

#: ../../js/datatables.functions.js:336
msgid "Doing batch insert file records"
msgstr ""
msgstr "Insertion batch des enregistrements de fichiers"

#: ../../js/datatables.functions.js:340
msgid "Incomplete"
msgstr ""
msgstr "Incomplet"

#: ../../js/datatables.functions.js:344
msgid "Committing data"
msgstr ""
msgstr "Insertion des données"

#: ../../js/datatables.functions.js:348
msgid "Warning"
msgstr ""
msgstr "Attention"

#: ../../js/datatables.functions.js:352
msgid "Doing data despooling"
msgstr ""
msgstr "Déspoulage des données en cours"

#: ../../js/datatables.functions.js:356
msgid "Queued waiting for device"
msgstr ""
msgstr "En attente de périphérique"
Binary file modified public/js/locale/ru_RU/LC_MESSAGES/ru_RU.mo
Binary file not shown.

0 comments on commit df92c7a

Please sign in to comment.