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:
parent
273c2e937a
commit
1141271bc2
2 changed files with 46 additions and 37 deletions
|
@ -1,42 +1,45 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect
|
||||
Name[ar]=تطبيق كدي المتّصل
|
||||
Name[ca]=Aplicació KDE Connect
|
||||
Name[ca@valencia]=Aplicació KDE Connect
|
||||
Name[cs]=Aplikace KDE Connect
|
||||
Name[da]=Programmet KDE Connect
|
||||
Name[de]=KDE-Connect-Anwendung
|
||||
Name[el]=Εφαρμογή KDE Connect
|
||||
Name[en_GB]=KDE Connect Application
|
||||
Name[es]=Aplicación KDE Connect
|
||||
Name[et]=KDE Connecti rakendus
|
||||
Name[eu]=KDE Connect aplikazioa
|
||||
Name[fi]=KDE Connect -sovellus
|
||||
Name[fr]=Application KDE Connect
|
||||
Name[gl]=Aplicativo de KDE Connect
|
||||
Name[he]=היישום KDE Connect
|
||||
Name[hu]=KDE Connect alkalmazás
|
||||
Name[id]=Aplikasi KDE Connect
|
||||
Name[it]=Applicazione KDE Connect
|
||||
Name[ko]=KDE Connect 프로그램
|
||||
Name[lt]=KDE Connect programa
|
||||
Name[nl]=KDE Connect-toepassing
|
||||
Name[nn]=KDE Connect-program
|
||||
Name[pl]=Program KDE Connect
|
||||
Name[pt]=Aplicação do KDE Connect
|
||||
Name[pt_BR]=Aplicativo KDE Connect
|
||||
Name[ru]=Приложение KDE Connect
|
||||
Name[sk]=KDE Connect aplikácia
|
||||
Name[sr]=КДЕ‑конекцијин програм
|
||||
Name[sr@ijekavian]=КДЕ‑конекцијин програм
|
||||
Name[sr@ijekavianlatin]=KDE‑konekcijin program
|
||||
Name[sr@latin]=KDE‑konekcijin program
|
||||
Name[sv]=Programmet KDE-anslut
|
||||
Name[tr]=KDE Connect Uygulaması
|
||||
Name[uk]=Програма KDE Connect
|
||||
Name[x-test]=xxKDE Connect Applicationxx
|
||||
Name[zh_CN]=KDE Connect 应用程序
|
||||
Name[zh_TW]=KDE 連線應用程式
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
Name[ca@valencia]=KDE Connect
|
||||
Name[cs]=KDE Connect
|
||||
Name[da]=KDE Connect
|
||||
Name[de]=KDE-Connect
|
||||
Name[el]=KDE Connect
|
||||
Name[en_GB]=KDE Connect
|
||||
Name[es]=KDE Connect
|
||||
Name[et]=KDE Connect
|
||||
Name[eu]=KDE Connect
|
||||
Name[fi]=KDE Connect
|
||||
Name[fr]=KDE Connect
|
||||
Name[gl]=KDE Connect
|
||||
Name[he]=KDE Connect
|
||||
Name[hu]=KDE csatlakozás
|
||||
Name[id]=KDE Connect
|
||||
Name[it]=KDE Connect
|
||||
Name[ko]=KDE Connect
|
||||
Name[lt]=KDE Connect
|
||||
Name[nl]=KDE Connect
|
||||
Name[nn]=KDE Connect
|
||||
Name[pl]=KDE Connect
|
||||
Name[pt]=KDE Connect
|
||||
Name[pt_BR]=KDE Connect
|
||||
Name[ro]=KDE Connect
|
||||
Name[ru]=KDE Connect
|
||||
Name[sk]=KDE Connect
|
||||
Name[sr]=КДЕ‑конекција
|
||||
Name[sr@ijekavian]=КДЕ‑конекција
|
||||
Name[sr@ijekavianlatin]=KDE‑konekcija
|
||||
Name[sr@latin]=KDE‑konekcija
|
||||
Name[sv]=KDE-anslut
|
||||
Name[tr]=KDE Connect
|
||||
Name[uk]=З’єднання KDE
|
||||
Name[x-test]=xxKDE Connectxx
|
||||
Name[zh_CN]=KDE Connect
|
||||
Name[zh_TW]=KDE 連線
|
||||
GenericName=Device Synchronization
|
||||
GenericName[ar]=مزامنة الأجهزة
|
||||
GenericName[ca]=Sincronització de dispositius
|
||||
|
|
|
@ -1,14 +1,20 @@
|
|||
[Desktop Entry]
|
||||
GenericName=Open on connected device via KDE Connect
|
||||
GenericName[ca]=Obre al dispositiu connectat a través del KDE Connect
|
||||
GenericName[nn]=Opna på tilkopla eining via KDE Connect
|
||||
GenericName[pt_BR]=Abrir no dispositivo conectado via KDE Connect
|
||||
GenericName[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect
|
||||
GenericName[x-test]=xxOpen on connected device via KDE Connectxx
|
||||
Name=Open on connected device via KDE Connect
|
||||
Name[ca]=Obre al dispositiu connectat a través del KDE Connect
|
||||
Name[nn]=Opna på tilkopla eining via KDE Connect
|
||||
Name[pt_BR]=Abrir no dispositivo conectado via KDE Connect
|
||||
Name[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect
|
||||
Name[x-test]=xxOpen on connected device via KDE Connectxx
|
||||
Comment=Open on a connected device using KDE Connect
|
||||
Comment[ca]=Obre a un dispositiu connectat usant el KDE Connect
|
||||
Comment[nn]=Opna på ei tilkopla eining via KDE Connect
|
||||
Comment[pt_BR]=Abre no dispositivo conectado usando o KDE Connect
|
||||
Comment[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect
|
||||
Comment[x-test]=xxOpen on a connected device using KDE Connectxx
|
||||
MimeType=*/*;
|
||||
|
|
Loading…
Reference in a new issue