Commit 4ae0951a authored by Script Kiddy's avatar Script Kiddy

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 8651234c
......@@ -163,7 +163,7 @@ X-KDE-Keywords[ga]=feidhmchlár,tosach,tosaigh,gafa,cúrsóir,aisfhotha,luch,luc
X-KDE-Keywords[gl]=aplicación,aplicativo,programa,inicio,iniciar,ocupado,cursor,indicador,rato, punteiro,rebotar,rodar,rotar,xirar,disco,informe,barra de tarefas
X-KDE-Keywords[hu]=alkalmazás,indítás,indítás,elfoglalt,kurzor,visszajelzés,egér,mutató,pattogás,forgatás,csavarás,lemez,indítás,program,jelentés,feladatsáv
X-KDE-Keywords[ia]=application,initio,lancea,occupate,cursor,retro information,mus,punctator,saltante,rotante,torneante,disco,initio,programma,reporto,barra de carga
X-KDE-Keywords[id]=aplikasi,start,jalankan,sibuk,kursor,umpan balik,tetikus,penunjuk,memantul,rotasi,berputar,cakram,startup,program,laporan,batang tugas
X-KDE-Keywords[id]=aplikasi,start,jalankan,sibuk,kursor,umpan balik,mouse,penunjuk,memantul,rotasi,berputar,cakram,startup,program,laporan,bilah tugas
X-KDE-Keywords[it]=applicazione,avvia,esegui,occupato,puntatore,segnale di avvio,mouse,puntatore,rimbalza,rotazione,disco,avvio,programma,resoconto,barra dei processi
X-KDE-Keywords[kk]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar
X-KDE-Keywords[km]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar
......
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