marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-01 01:07:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2020-12-25 06:23:37 +01:00
parent 77414b5230
commit 69f223746d
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applets/krunner/metadata.desktop
View file

@ -21,6 +21,7 @@ Name[lt]=Ieškoti ir paleisti
Name[nl]=Zoeken en uitvoeren Name[nl]=Zoeken en uitvoeren
Name[nn]=Søk og køyr Name[nn]=Søk og køyr
Name[pa]=ਖੋਜੋ ਤੇ ਚਲਾਓ Name[pa]=ਖੋਜੋ ਤੇ ਚਲਾਓ
Name[pl]=Znajdź i uruchom
Name[pt]=Pesquisar e Executar Name[pt]=Pesquisar e Executar
Name[pt_BR]=Pesquisar e executar Name[pt_BR]=Pesquisar e executar
Name[ro]=Căutare și lansare 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[nl]=Zoeken en uitvoeren van toepassingen en services
Comment[nn]=Søk etter og køyr program og tenester Comment[nn]=Søk etter og køyr program og tenester
Comment[pa]=ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਸੇਵਾਵਾਂ ਖੋਜੋ ਤੇ ਚਲਾਓ Comment[pa]=ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਸੇਵਾਵਾਂ ਖੋਜੋ ਤੇ ਚਲਾਓ
Comment[pl]=Znajduj i uruchamiaj aplikacje i usługi
Comment[pt]=Pesquisa e executa aplicações e serviços Comment[pt]=Pesquisa e executa aplicações e serviços
Comment[pt_BR]=Pesquisa e executa aplicativos e serviços Comment[pt_BR]=Pesquisa e executa aplicativos e serviços
Comment[ro]=Caută și rulează aplicații și servicii Comment[ro]=Caută și rulează aplicații și servicii