wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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"
remotes/origin/release/22.04
l10n daemon script 4 years ago
parent 06612d93f0
commit b910edafb6
5 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      core/okularGenerator.desktop
  2. 2
      generators/chm/libokularGenerator_chmlib.json
  3. 2
      generators/dvi/libokularGenerator_dvi.json
  4. 2
      generators/poppler/libokularGenerator_poppler.json
  5. 2
      generators/spectre/libokularGenerator_ghostview.json

2
core/okularGenerator.desktop
Unescape View File

@ -7,7 +7,7 @@ Comment[az]=Okulyar üçün fayl formatı modulu
Comment[bg]=Ядро на Okular за файлови формати
Comment[bs]=Pozadina formata datoteke za Okular
Comment[ca]=Dorsal del format de fitxer per a l'Okular
Comment[ca@valencia]=Dorsal del format de ficher per a Okular
Comment[ca@valencia]=Dorsal del format de fitxer per a Okular
Comment[cs]=Podpůrná vrstva formátu souboru pro Okular
Comment[da]=Filformatmotor til Okular
Comment[de]=Dateiformat-Modul für Okular

2
generators/chm/libokularGenerator_chmlib.json
Unescape View File

@ -136,7 +136,7 @@
"Description": "A Microsoft Windows help file renderer",
"Description[ar]": "عارض مستندات مساعدة ويندوز",
"Description[az]": "Microsoft Windows köməkçi fayl tərtibatçısı",
"Description[ca@valencia]": "Un renderisador de fichers d'ajuda de Microsoft Windows",
"Description[ca@valencia]": "Un renderisador de fitxers d'ajuda de Microsoft Windows",
"Description[ca]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows",
"Description[cs]": "Nástroj pro zobrazování nápovědy Microsoft Windows",
"Description[da]": "En gengiver til Microsoft Windows-hjælpfiler",

2
generators/dvi/libokularGenerator_dvi.json
Unescape View File

@ -91,7 +91,7 @@
"Description": "A DVI file renderer",
"Description[ar]": "عارض ملف DVI",
"Description[az]": "DVİ faylı tərtibatçısı",
"Description[ca@valencia]": "Un renderisador de fichers DVI",
"Description[ca@valencia]": "Un renderisador de fitxers DVI",
"Description[ca]": "Un renderitzador de fitxers DVI",
"Description[cs]": "Vykreslovač DVI souborů",
"Description[da]": "En gengiver til DVI-filer",

2
generators/poppler/libokularGenerator_poppler.json
Unescape View File

@ -92,7 +92,7 @@
"Description": "A PDF file renderer",
"Description[ar]": "عارض ملفات بي دي اف",
"Description[az]": "PDF faylı tərtibatçısı",
"Description[ca@valencia]": "Un renderisador de fichers PDF",
"Description[ca@valencia]": "Un renderisador de fitxers PDF",
"Description[ca]": "Un renderitzador de fitxers PDF",
"Description[cs]": "Vykreslovač PDF souborů",
"Description[da]": "En gengiver til PDF-filer",

2
generators/spectre/libokularGenerator_ghostview.json
Unescape View File

@ -92,7 +92,7 @@
"Description": "A PostScript file renderer based on the Spectre library",
"Description[ar]": "عراض ملفات بوست سكربت بالإعماد على مكتبة Spectre",
"Description[az]": "Spectre library'ə əsasında PostScript fayl tərtibatçısı",
"Description[ca@valencia]": "Un renderisador de fichers PostScript basat en la biblioteca Spectre",
"Description[ca@valencia]": "Un renderisador de 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",

Write Preview
Loading…
Cancel
Save