From dcc6cd77f230aa5b0222f1fc42e11931256e1ce7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Nov 2022 01:49:28 +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/chm/libokularGenerator_chmlib.json | 1 + generators/comicbook/libokularGenerator_comicbook.json | 1 + generators/djvu/libokularGenerator_djvu.json | 1 + generators/spectre/libokularGenerator_ghostview.json | 1 + 4 files changed, 4 insertions(+) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index cce672e7b..1448e9a51 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -166,6 +166,7 @@ "Description[hu]": "Microsoft Windows súgófájl-leképező", "Description[ia]": "Un rendition de file de adjuta de Microsoft Windows", "Description[it]": "Un visualizzatore per file di aiuto di Microsoft Windows", + "Description[ka]": "Microsoft Windows -ის დახმარების ფაილის რენდერერი", "Description[ko]": "Microsoft Windows 도움말 파일 표시기", "Description[lt]": "Microsoft Windows pagalbos failų atvaizdavimas", "Description[nl]": "Een viewer voor Microsoft Windows-helpbestanden", diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 3603fd482..9567c8555 100644 --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -118,6 +118,7 @@ "Description[hu]": "Leképező különböző képregényformátumokhoz", "Description[ia]": "Un rendition pro varie formatos de libros comic", "Description[it]": "Un visualizzatore per vari formati di strisce a fumetti", + "Description[ka]": "რენდერერი სხვადასხვა კომიქსების წიგნის ფორმატებისთვის", "Description[ko]": "다양한 만화책 형식 렌더러", "Description[lt]": "Įvairių komiksų knygų formatų atvaizdavimas", "Description[nl]": "Een viewer voor diverse ComicBook-formaten", diff --git a/generators/djvu/libokularGenerator_djvu.json b/generators/djvu/libokularGenerator_djvu.json index 1ff4fb809..ab76cf583 100644 --- a/generators/djvu/libokularGenerator_djvu.json +++ b/generators/djvu/libokularGenerator_djvu.json @@ -119,6 +119,7 @@ "Description[ia]": "Retro-Administration de DjVu basate sur DjVuLibre.", "Description[ie]": "Infrastructura DjVu basat sur DjVuLibre", "Description[it]": "Backend DjVu basato su DjVuLibre", + "Description[ka]": "DjVuLibre-ზე ბაზირებული DjVu -ის უკანაბოლო", "Description[ko]": "DjVuLibre 기반 DjVu 백엔드", "Description[lt]": "DjVu programinė sąsaja pagrįsta DjVuLibre", "Description[nl]": "DjVu-backend gebaseerd op DjVuLibre", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index 0263a6cd8..f202db104 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -118,6 +118,7 @@ "Description[hu]": "A Spectre függvénykönyvtárra épülő PostScript-fájl leképező", "Description[ia]": "Un renditor de file Postscript basate sur bibliotheca Spectre", "Description[it]": "Un visualizzatore di file PostScript basato sulla libreria Spectre", + "Description[ka]": "ბიბლიოთეკა Spectre -ზე ბაზირებული PostScript ფაილების რენდერერი", "Description[ko]": "Spectre 라이브러리를 사용하는 포스트스크립트 파일 렌더러", "Description[lt]": "PostScript failų atvaizdavimas pagrįstas Spectre biblioteka", "Description[nl]": "Een renderer van PostScript bestanden gebaseerd op de bibliotheek Spectre",