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
ffb0f3db9f
commit
60b1f83b48
1 changed files with 0 additions and 34 deletions
|
@ -1,39 +1,5 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=KDE Connect URL Handler
|
Name=KDE Connect URL Handler
|
||||||
Name[ca]=Gestor d'URL de telèfons del KDE Connect
|
|
||||||
Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect
|
|
||||||
Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect
|
|
||||||
Name[da]=Telefon-URL-håndtering til KDE Connect
|
|
||||||
Name[de]=KDE-Connect-Telefon-Dienstprogramm für URLs (Adressen)
|
|
||||||
Name[el]=KDE Connect χειριστής URL για σύνδεση τηλεφώνου
|
|
||||||
Name[en_GB]=KDE Connect Phone URL Handler
|
|
||||||
Name[es]=Controlador de URL de teléfonos de KDE Connect
|
|
||||||
Name[et]=KDE Connecti telefoni URL-ide käitleja
|
|
||||||
Name[eu]=KDE Connect-en telefono-URL-kudeatzailea
|
|
||||||
Name[fi]=KDE Connectin puhelinverkko-osoitekäsittelijä
|
|
||||||
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
|
|
||||||
Name[gl]=Xestor de URL de teléfono de KDE Connect
|
|
||||||
Name[id]=Penanganan URL Phone KDE Connect
|
|
||||||
Name[it]=Gestore URL del telefono di KDE Connect
|
|
||||||
Name[ko]=KDE Connect 휴대폰 URL 처리기
|
|
||||||
Name[lt]=KDE Connect telefono URL doroklė
|
|
||||||
Name[nl]=URL behandelaar van KDE-Connect-telefoon
|
|
||||||
Name[nn]=Telefon-URL-handsamar for KDE Connect
|
|
||||||
Name[pl]=KDE Connect - obsługa URL telefonu
|
|
||||||
Name[pt]=Tratamento de URL's Telefónicos do KDE Connect
|
|
||||||
Name[pt_BR]=Tratamento de URLs do KDE Connect
|
|
||||||
Name[ru]=Обработчик телефонных ссылок KDE Connect
|
|
||||||
Name[sk]=Obslužný program URL telefónu KDE Connect
|
|
||||||
Name[sr]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима
|
|
||||||
Name[sr@ijekavian]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима
|
|
||||||
Name[sr@ijekavianlatin]=KDE‑konekcijin rukovalac telefonskim URL‑ovima
|
|
||||||
Name[sr@latin]=KDE‑konekcijin rukovalac telefonskim URL‑ovima
|
|
||||||
Name[sv]=KDE-anslut hanterare av telefonwebbadress
|
|
||||||
Name[tr]=KDE Connect Telefon URL İşleyici
|
|
||||||
Name[uk]=Обробник телефонних адрес KDE Connect
|
|
||||||
Name[x-test]=xxKDE Connect Phone URL Handlerxx
|
|
||||||
Name[zh_CN]=KDE Connect 电话 URL 处理程序
|
|
||||||
Name[zh_TW]=KDE 連線手機網址處理器
|
|
||||||
Exec=kdeconnect-handler %U
|
Exec=kdeconnect-handler %U
|
||||||
Icon=kdeconnect
|
Icon=kdeconnect
|
||||||
Type=Application
|
Type=Application
|
||||||
|
|
Loading…
Reference in a new issue