SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2021-09-04 01:15:44 +00:00
parent b80d3614ef
commit 54687d764d
6 changed files with 6 additions and 6 deletions

View file

@ -85,7 +85,7 @@
"Description[ar]": "خلفية EPub",
"Description[az]": "EPub modulu",
"Description[ca@valencia]": "Un dorsal per a l'EPub",
"Description[ca]": "Un dorsal per a l'EPub",
"Description[ca]": "Un dorsal d'EPub",
"Description[cs]": "Podpůrná vrstva EPub",
"Description[da]": "En EPub-backend",
"Description[de]": "Ein Anzeigemodul für EPUB",

View file

@ -87,7 +87,7 @@
"Description[ar]": "خلفية مستندات فاكس G3/G4",
"Description[az]": "A G3/G4 fax sənədi modulu",
"Description[ca@valencia]": "Un dorsal per a documents de fax G3/G4",
"Description[ca]": "Un dorsal per a documents de fax G3/G4",
"Description[ca]": "Un dorsal de documents de fax G3/G4",
"Description[cs]": "Implementace dokumentu faxu A G3/G4",
"Description[da]": "En G3/G4 faxdokument-backend",
"Description[de]": "Ein Anzeigemodul für G3/G4-Faxe",

View file

@ -86,7 +86,7 @@
"Description[ar]": "خلفية Mobipocket",
"Description[az]": "Mobipocket modulu",
"Description[ca@valencia]": "Un dorsal per al Mobipocket",
"Description[ca]": "Un dorsal per al Mobipocket",
"Description[ca]": "Un dorsal de Mobipocket",
"Description[cs]": " Implementace Mobipocket",
"Description[da]": "En mobipocket-backend",
"Description[de]": "Ein Anzeigemodul für Mobipocket-Dateien",

View file

@ -130,7 +130,7 @@
"Name[ar]": "خلفية مستندات Plucker",
"Name[az]": "Plucker sənədi modulu",
"Name[ca@valencia]": "Dorsal per a documents Plucker",
"Name[ca]": "Dorsal per a documents Plucker",
"Name[ca]": "Dorsal de documents Plucker",
"Name[cs]": "Podpůrná vrstva Plucker Dokumentu",
"Name[da]": "Plucker-dokument-backend",
"Name[de]": "Anzeigemodul für Plucker-Dokumente",

View file

@ -87,7 +87,7 @@
"Description[ar]": "عراض ملفات بوست سكربت بالإعماد على مكتبة Spectre",
"Description[az]": "Spectre library'ə əsasında PostScript fayl tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per a fitxers PostScript basat en la biblioteca Spectre",
"Description[ca]": "Un renderitzador per a fitxers PostScript basat en la biblioteca Spectre",
"Description[ca]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre",
"Description[cs]": "Vykreslovač souborů PostScript založený na knihovně Spectre.",
"Description[da]": "En gengiver til PostScript-filer baseret på Spectre-biblioteket",
"Description[de]": "Ein Renderer für PostScript-Dateien entwickelt aus der Spectre-Bibliothek",

View file

@ -170,7 +170,7 @@
"Description[ar]": "خلفية XPS",
"Description[az]": "XPS modulu",
"Description[ca@valencia]": "Un dorsal per a l'XPS",
"Description[ca]": "Un dorsal per a l'XPS",
"Description[ca]": "Un dorsal de XPS",
"Description[cs]": "Podpůrná vrstva XPS",
"Description[da]": "En XPS-backend",
"Description[de]": "Ein Anzeigemodul für XPS",