mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 15:03: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
77414b5230
commit
69f223746d
1 changed files with 2 additions and 0 deletions
|
|
@ -21,6 +21,7 @@ Name[lt]=Ieškoti ir paleisti
|
|||
Name[nl]=Zoeken en uitvoeren
|
||||
Name[nn]=Søk og køyr
|
||||
Name[pa]=ਖੋਜੋ ਤੇ ਚਲਾਓ
|
||||
Name[pl]=Znajdź i uruchom
|
||||
Name[pt]=Pesquisar e Executar
|
||||
Name[pt_BR]=Pesquisar e executar
|
||||
Name[ro]=Căutare și lansare
|
||||
|
|
@ -54,6 +55,7 @@ Comment[lt]=Ieškoti ir paleisti programas bei tarnybas
|
|||
Comment[nl]=Zoeken en uitvoeren van toepassingen en services
|
||||
Comment[nn]=Søk etter og køyr program og tenester
|
||||
Comment[pa]=ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਸੇਵਾਵਾਂ ਖੋਜੋ ਤੇ ਚਲਾਓ
|
||||
Comment[pl]=Znajduj i uruchamiaj aplikacje i usługi
|
||||
Comment[pt]=Pesquisa e executa aplicações e serviços
|
||||
Comment[pt_BR]=Pesquisa e executa aplicativos e serviços
|
||||
Comment[ro]=Caută și rulează aplicații și servicii
|
||||
|
|
|
|||
Loading…
Reference in a new issue