From 54687d764da30829d3459ba45601fe39bc259c1b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Sep 2021 01:15:44 +0000 Subject: [PATCH] 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" --- generators/epub/libokularGenerator_epub.json | 2 +- generators/fax/libokularGenerator_fax.json | 2 +- generators/mobipocket/libokularGenerator_mobi.json | 2 +- generators/plucker/libokularGenerator_plucker.json | 2 +- generators/spectre/libokularGenerator_ghostview.json | 2 +- generators/xps/libokularGenerator_xps.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generators/epub/libokularGenerator_epub.json b/generators/epub/libokularGenerator_epub.json index 299ff5f9f..cf21d18d0 100644 --- a/generators/epub/libokularGenerator_epub.json +++ b/generators/epub/libokularGenerator_epub.json @@ -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", diff --git a/generators/fax/libokularGenerator_fax.json b/generators/fax/libokularGenerator_fax.json index f68074dde..3e3fba591 100644 --- a/generators/fax/libokularGenerator_fax.json +++ b/generators/fax/libokularGenerator_fax.json @@ -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", diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json index fb59e3e76..00674b38a 100644 --- a/generators/mobipocket/libokularGenerator_mobi.json +++ b/generators/mobipocket/libokularGenerator_mobi.json @@ -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", diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json index e8fcaaf8f..b7d6a8c81 100644 --- a/generators/plucker/libokularGenerator_plucker.json +++ b/generators/plucker/libokularGenerator_plucker.json @@ -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", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index feb24f6de..1866b2a12 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -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", diff --git a/generators/xps/libokularGenerator_xps.json b/generators/xps/libokularGenerator_xps.json index 6f465ca2b..52ed407d6 100644 --- a/generators/xps/libokularGenerator_xps.json +++ b/generators/xps/libokularGenerator_xps.json @@ -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",