Commit 51225ba1 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 effad9ac
...@@ -164,3 +164,4 @@ X-KDE-Keywords[sr@latin]=Autostart Manager,autostart,startup,system startup,plas ...@@ -164,3 +164,4 @@ X-KDE-Keywords[sr@latin]=Autostart Manager,autostart,startup,system startup,plas
X-KDE-Keywords[sv]=Hantering av autostart,autostart,start,systemstart,plasma-start,cron X-KDE-Keywords[sv]=Hantering av autostart,autostart,start,systemstart,plasma-start,cron
X-KDE-Keywords[uk]=Autostart Manager,autostart,startup,system startup,plasma start,cron,керування автозапуском,автозапуск,запуск,запуск системи,запуск плазми X-KDE-Keywords[uk]=Autostart Manager,autostart,startup,system startup,plasma start,cron,керування автозапуском,автозапуск,запуск,запуск системи,запуск плазми
X-KDE-Keywords[x-test]=xxAutostart Managerxx,xxautostartxx,xxstartupxx,xxsystem startupxx,xxplasma startxx,xxcronxx X-KDE-Keywords[x-test]=xxAutostart Managerxx,xxautostartxx,xxstartupxx,xxsystem startupxx,xxplasma startxx,xxcronxx
X-KDE-Keywords[zh_CN]=Autostart Manager,autostart,startup,system startup,plasma start,cron,自动启动管理器,自动启动,启动,系统启动,plasma 启动,任务调度
...@@ -160,7 +160,7 @@ X-KDE-Keywords[fa]=application,start,launch,busy,cursor,feedback,mouse,pointer,b ...@@ -160,7 +160,7 @@ X-KDE-Keywords[fa]=application,start,launch,busy,cursor,feedback,mouse,pointer,b
X-KDE-Keywords[fi]=sovellus,käynnistä,käynnistys,varattu,osoitin,ilmaiseminen,hiiri,pomppiva,ohjelma,ilmaisu,tehtäväpalkki X-KDE-Keywords[fi]=sovellus,käynnistä,käynnistys,varattu,osoitin,ilmaiseminen,hiiri,pomppiva,ohjelma,ilmaisu,tehtäväpalkki
X-KDE-Keywords[fr]=application, démarrer, lancement, occupé, curseur, réaction, souris, pointeur, rebondissant, tournant, rotation, disque, démarrage, programme, rapport, barre de tâches X-KDE-Keywords[fr]=application, démarrer, lancement, occupé, curseur, réaction, souris, pointeur, rebondissant, tournant, rotation, disque, démarrage, programme, rapport, barre de tâches
X-KDE-Keywords[ga]=feidhmchlár,tosach,tosaigh,gafa,cúrsóir,aisfhotha,luch,luchóg,pointeoir,rothlú,casadh,diosca,tosú,clár,tuairisc X-KDE-Keywords[ga]=feidhmchlár,tosach,tosaigh,gafa,cúrsóir,aisfhotha,luch,luchóg,pointeoir,rothlú,casadh,diosca,tosú,clár,tuairisc
X-KDE-Keywords[gl]=programa, inicio, lanzar, iniciar, ocupado, cursor, indicador, rato, punteiro rebotar, xirar, disco, aplicación, barra de tarefas 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[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[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,tetikus,penunjuk,memantul,rotasi,berputar,cakram,startup,program,laporan,batang tugas
......
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