Commit 85b6efcb authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 38818a95
[Desktop Entry]
Type=Service
Name=Qt Designer Files
Name[ast]=Ficheros de Qt Designer
Name[bg]=Файлове на Qt Designer
Name[br]=Restroù Ergrafer Qt
Name[bs]=Qt dizajnerske datoteke
Name[ca]=Fitxers de Qt Designer
Name[ca@valencia]=Fitxers de Qt Designer
Name[cs]=Soubory Qt designeru
Name[cy]=Ffeiliau Qt Designer
Name[da]=Qt Designer-filer
Name[de]=Qt-Designer-Dateien
Name[el]=Αρχεία Qt Designer
Name[en_GB]=Qt Designer Files
Name[es]=Archivos de Qt Designer
Name[et]=Qt Designeri failid
Name[eu]=Qt Designer fitxategiak
Name[fa]=پرونده‌های طراح Qt
Name[fi]=Qt Designer -tiedostot
Name[fr]=Fichiers « Qt Designer »
Name[ga]=Comhaid Qt Designer
Name[gl]=Ficheiros de Qt Designer
Name[hu]=Qt Designer-fájlok
Name[is]=Qt Designer skrár
Name[it]=File di Qt Designer
Name[ja]=Qt デザイナーファイル
Name[kk]=Qt Designer файлы
Name[km]=ឯកសារ​កម្មវិធី​រចនា​របស់​ Qt
Name[ko]=Qt 디자이너 파일
Name[lt]=Qt Designer failai
Name[lv]=Qt dizainera faili
Name[mr]=Qt डिजाइनर फाईल्स
Name[nb]=Qt Designer-filer
Name[nds]=Qt-Designer-Dateien
Name[ne]=Qt डिजाइनर फाइल
Name[nl]=Qt Designer-bestanden
Name[nn]=Qt Designer-filer
Name[pa]=Qt Designer ਫਾਇਲ
Name[pl]=Pliki Qt Designer
Name[pt]=Ficheiros do Qt Designer
Name[pt_BR]=Arquivos do Qt Designer
Name[ro]=Fișiere Qt Designer
Name[ru]=Файлы Qt Designer
Name[sk]=Súbory Qt Designer
Name[sl]=Datoteke za Qt Designer
Name[sr]=Фајлови КуТ‑дизајнера
Name[sr@ijekavian]=Фајлови КуТ‑дизајнера
Name[sr@ijekavianlatin]=Fajlovi QtDesignera
Name[sr@latin]=Fajlovi QtDesignera
Name[sv]=Qt-designer-filer
Name[ta]=Qt வடிவமை கோப்புகள்
Name[tg]=Файлҳои Qt Designer
Name[tr]=Qt Tasarımcı Dosyaları
Name[uk]=Файли Qt Designer
Name[x-test]=xxQt Designer Filesxx
Name[zh_CN]=Qt 设计师文件
Name[zh_TW]=Qt Designer 檔案
ServiceTypes=ThumbCreator
MimeType=application/x-designer;
X-KDE-Library=quithumbnail
......
[Desktop Entry]
Name=KUIViewerPart
Name[ast]=KUIViewerPart
Name[bg]=KUIViewerPart
Name[br]=KUIViewerPart
Name[bs]=KUIViewerPart
Name[ca]=KUIViewerPart
Name[ca@valencia]=KUIViewerPart
Name[cs]=KUIViewerPart
Name[cy]=KUIViewerPart
Name[da]=KUIViewerPart
Name[de]=KUIViewerPart
Name[el]=KUIViewerPart
Name[en_GB]=KUIViewerPart
Name[es]=KUIViewerPart
Name[et]=KUIViewerPart
Name[eu]=KUIViewerPart
Name[fi]=KUIViewerPart
Name[fr]=Composant de KUIViewer
Name[ga]=KUIViewerPart
Name[gl]=KUIViewerPart
Name[hu]=KUIViewerPart
Name[is]=KUIViewerPart
Name[it]=KUIViewerPart
Name[ja]=KUIViewerPart
Name[kk]=KUIViewerPart
Name[km]=KUIViewerPart
Name[ko]=KUIViewerPart
Name[lt]=KUIViewerPart
Name[lv]=KUIViewerPart
Name[mr]=केयुआय-व्ह्युअर-पार्ट
Name[nb]=KUIViewerPart
Name[nds]=KUIViewerPart
Name[ne]=KUIViewerPart
Name[nl]=KUIViewerPart
Name[nn]=KUIViewerPart
Name[pa]=KUIViewerPart
Name[pl]=KUIViewerPart
Name[pt]=KUIViewerPart
Name[pt_BR]=KUIViewerPart
Name[ro]=KUIViewerPart
Name[ru]=KUIViewerPart
Name[sk]=KUIViewerPart
Name[sl]=KUIViewerPart
Name[sr]=К‑УИ‑приказивач део
Name[sr@ijekavian]=К‑УИ‑приказивач део
Name[sr@ijekavianlatin]=K‑UI‑prikazivač deo
Name[sr@latin]=K‑UI‑prikazivač deo
Name[sv]=KUIviewer-del
Name[ta]=KUIவியூவர் உறுப்பு
Name[tg]=KUIViewerPart
Name[tr]=KUIViewerPart
Name[ug]=KUIViewerPart
Name[uk]=KUIViewerPart
Name[x-test]=xxKUIViewerPartxx
Name[zh_CN]=KUIViewerPart
Name[zh_TW]=KUIViewerPart
Icon=kuiviewer
MimeType=application/x-designer;
ServiceTypes=KParts/ReadOnlyPart
......
[Desktop Entry]
Name=KUIViewer
Name[ast]=KUIViewer
Name[bg]=KUIViewer
Name[br]=KUIViewer
Name[bs]=KUIViewer
Name[ca]=KUIViewer
Name[ca@valencia]=KUIViewer
Name[cs]=KUIViewer
Name[cy]=KUIGwelydd
Name[da]=KUIViewer
Name[de]=KUIViewer
Name[el]=KUIViewer
Name[en_GB]=KUIViewer
Name[es]=KUIViewer
Name[et]=KUIViewer
Name[eu]=KUIViewer
Name[fi]=KUIViewer
Name[fr]=KUIViewer
Name[ga]=KUIViewer
Name[gl]=KUIViewer
Name[he]=KUIViewer
Name[hu]=KUIViewer
Name[is]=KUIViewer
Name[it]=KUIViewer
Name[ja]=KUI ビューア
Name[kk]=KUIViewer
Name[km]=KUIViewer
Name[ko]=KUIViewer
Name[lt]=KUIViewer
Name[lv]=KUIViewer
Name[mr]=केयुआय-व्ह्युअर
Name[nb]=KUIViewer
Name[nds]=KUIViewer
Name[ne]=KUIViewer
Name[nl]=KUIViewer
Name[nn]=KUIViewer
Name[pa]=KUIViewer
Name[pl]=KUIViewer
Name[pt]=KUIViewer
Name[pt_BR]=KUIViewer
Name[ro]=KUIViewer
Name[ru]=KUIViewer
Name[sk]=KUIViewer
Name[sl]=KUIViewer
Name[sr]=К‑УИ‑приказивач
Name[sr@ijekavian]=К‑УИ‑приказивач
Name[sr@ijekavianlatin]=K‑UI‑prikazivač
Name[sr@latin]=K‑UI‑prikazivač
Name[sv]=KUIviewer
Name[ta]=KUIவியூவர்
Name[tg]=KUIViewer
Name[tr]=KUIViewer
Name[ug]=KUIViewer
Name[uk]=KUIViewer
Name[x-test]=xxKUIViewerxx
Name[zh_CN]=KUIViewer
Name[zh_TW]=KUIViewer
Exec=kuiviewer -caption %c
Icon=kuiviewer
Type=Application
GenericName=Qt Designer UI File Viewer
GenericName[ast]=Visor de ficheros UI de Qt Designer
GenericName[bg]=Преглед на файлове на Qt Designer
GenericName[br]=Ur gweler restr UI Ergrafer Qt
GenericName[bs]=Preglednik datoteka Qt dizajnera
GenericName[ca]=Visor de fitxer UI de Qt Designer
GenericName[ca@valencia]=Visor de fitxer UI de Qt Designer
GenericName[cs]=Prohlížeč UI souborů z Qt Designeru
GenericName[cy]=Gwelydd Ffeiliau UI Qt Designer
GenericName[da]=Qt Designer UI filviser
GenericName[de]=Betrachter für UI-Dateien des Qt Designer
GenericName[el]=Προβολέας αρχείων Qt Designer UI
GenericName[en_GB]=Qt Designer UI File Viewer
GenericName[es]=Visor de archivos UI de Qt Designer
GenericName[et]=Qt Designeri UI-failide näitaja
GenericName[eu]=Qt Designer UI fitxartegi ikusgailua
GenericName[fa]=مشاهده‌گر پرونده واسط نگاره‌ای طراح Qt
GenericName[fi]=Qt Designerin UI-tiedostojen katselin
GenericName[fr]=Afficheur de fichiers d'interface graphique « Qt Designer »
GenericName[ga]=Amharcán Comhad Qt Designer
GenericName[gl]=Visor de ficheiros de Qt Designer
GenericName[hu]=Qt Designer UI-fájlnézegető
GenericName[is]=Qt Designer UI skráaskoðari
GenericName[it]=Visualizzatore per file UI di Qt Designer
GenericName[ja]=Qt デザイナー UI ファイルビューア
GenericName[kk]=Qt Designer UI файлын қарау құралы
GenericName[km]=កម្មវិធី​មើល​​ឯកសារ​របស់​ UI ​កម្មវិធី​រចនា​របស់​ Qt
GenericName[ko]=Qt 디자이너 UI 파일 뷰어
GenericName[lt]=Qt Designer naudotojo sąsajos failų žiūryklė
GenericName[lv]=Qt dizainera UI failu skatītājs
GenericName[mr]=Qt डिजाइनर UI फाईल प्रदर्शक
GenericName[nb]=Qt Designer UI-filviser
GenericName[nds]=Kieker för Qt-Designer sien UI-Dateien
GenericName[ne]=Qt डिजाइनर यूआई फाइल दर्शक
GenericName[nl]=Weergave van QT Designer UI-bestanden
GenericName[nn]=Qt Designer UI-filvisar
GenericName[pl]=Przeglądarka plików interfejsu użytkownika Qt Designera
GenericName[pt]=Visualizador de Ficheiros UI do Qt Designer
GenericName[pt_BR]=Visualizador de arquivos UI do Qt Designer
GenericName[ro]=Vizualizator de fișiere Qt Designer UI
GenericName[ru]=Просмотрщик UI-файлов Qt Designer
GenericName[sk]=Prehliadač súborov UI pre Qt Designer
GenericName[sl]=Pregledovalnik datotek UI za Snovalnik Qt
GenericName[sr]=Приказивач УИ фајлова КуТ‑дизајнера
GenericName[sr@ijekavian]=Приказивач УИ фајлова КуТ‑дизајнера
GenericName[sr@ijekavianlatin]=Prikazivač UI fajlova QtDesignera
GenericName[sr@latin]=Prikazivač UI fajlova QtDesignera
GenericName[sv]=Qt-designer UI-filvisning
GenericName[ta]=Qt வடிவமைப்பவர் UI கோப்புகள் காட்சியகம்
GenericName[tg]=Намоишгари UI-файлҳо Qt Designer
GenericName[tr]=Qt Tasarımcı UI Dosya Göstericisi
GenericName[ug]=Qt Designer UI ھۆججەت كۆرگۈچ
GenericName[uk]=Переглядач UI-файлів Qt Designer
GenericName[x-test]=xxQt Designer UI File Viewerxx
GenericName[zh_CN]=Qt 设计师 UI 文件查看器
GenericName[zh_TW]=Qt Designer UI 檔案檢視器
GenericName=A quick viewer for Qt Designer UI File
MimeType=application/x-designer;
Terminal=false
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment