mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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
c9f466117b
commit
d806a097e0
1 changed files with 2 additions and 0 deletions
|
|
@ -5,6 +5,7 @@ Name[ca]=Cerca i executa
|
|||
Name[es]=Buscar y ejecutar
|
||||
Name[et]=Otsimine ja käivitamine
|
||||
Name[eu]=Bilatu eta exekutatu
|
||||
Name[id]=Cari Dan Jalankan
|
||||
Name[it]=Cerca e avvia
|
||||
Name[ko]=찾아서 실행하기
|
||||
Name[lt]=Ieškoti ir paleisti
|
||||
|
|
@ -24,6 +25,7 @@ Comment[ca]=Cerca i executa aplicacions i serveis
|
|||
Comment[es]=Buscar y ejecutar aplicaciones y servicios
|
||||
Comment[et]=Rakenduste ja teenuste otsimine ja käivitamine
|
||||
Comment[eu]=Bilatu eta exekutatu aplikazioak eta zerbitzuak
|
||||
Comment[id]=Cari dan jalankan Aplikasi dan layanan
|
||||
Comment[it]=Cerca e avvia applicazioni e servizi
|
||||
Comment[ko]=프로그램과 서비스 찾아서 실행하기
|
||||
Comment[lt]=Ieškoti ir paleisti programas bei tarnybas
|
||||
|
|
|
|||
Loading…
Reference in a new issue