Commit f859c218 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 383cec58
......@@ -11,6 +11,7 @@ Name[gl]=Saída de sesión
Name[ia]=Abandona session
Name[id]=Sesi Berhenti
Name[it]=Chiusura sessione
Name[ko]=세션 종료
Name[lt]=Seanso baigimas
Name[nl]=Afsluiten van sessie
Name[nn]=Avslutt økt
......@@ -35,6 +36,7 @@ Comment[fi]=Pidä työpöydän tausta käynnissä aina uloskirjautumisen loppuun
Comment[gl]=Manter vivo o fondo de escritorio durante a saída ata o final
Comment[id]=Jaga latarbelakang desktop tetap nyala selama logout sampai akhir
Comment[it]=Mantieni attivo lo sfondo del desktop durante la chiusura della sessione fino alla fine
Comment[ko]=로그아웃이 끝날 때까지 데스크톱 배경 그림 유지
Comment[lt]=Atsijungiant, išlaikyti darbalaukio foną reaguojantį iki pat galo
Comment[nl]=De achtergrond van het bureaublad tot het einde levend houden gedurende afmelden
Comment[nn]=Hald skrivebordsbakgrunnen i live heilt til utlogginga er fullført
......
......@@ -110,6 +110,7 @@ X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,konposatzailea,efektua,3Dtako efektu
X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet
X-KDE-Keywords[fr]=Gestionnaire de fenêtres KWin, kwin,window,manager,compositeur, effet, effets 3D,effets 2D,OpenGL,XRender,paramétrage video,effets graphiques ,effects du bureau
X-KDE-Keywords[it]=kwin,finestra,gestore,composizione,effetto,effetti 3D,effetti 2D,OpenGL,XRender,impostazioni video,effetti grafici,effetti del desktop
X-KDE-Keywords[ko]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과
X-KDE-Keywords[lt]=kwin,langas,langai,tvarkytuvė,tvarkytuve,komponavimas,kompozicionavimas,efektas,efektai,3D efektai,2D efektai,trimačiai efektai,trimaciai efektai,dvimačiai efektai,dvimaciai efektai,OpenGL,XRender,vaizdo nustatymai,vaizdo nuostatos,video nustatymai,video nuostatos,grafiniai efektai,grafikos efektai,darbalaukio efektai,darbastalio efektai
X-KDE-Keywords[nl]=kwin,window,manager,beheerder,compositing,effecten,3D-effecten,2D-effecten,OpenGL,XRender,video-instellingen,grafische effecten,bureaubladeffecten
X-KDE-Keywords[pt]=kwin,janela,gestor,composição,efeito,efeitos 3D,efeitos 2D,OpenGL,XRender,configuração do vídeo,efeitos gráficos,efeitos do ecrã
......
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