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
a3d8270e90
commit
88f838d147
1 changed files with 4 additions and 0 deletions
|
|
@ -4,6 +4,7 @@ Name=Search And Run
|
|||
Name[ca]=Cerca i executa
|
||||
Name[es]=Buscar y ejecutar
|
||||
Name[et]=Otsimine ja käivitamine
|
||||
Name[eu]=Bilatu eta exekutatu
|
||||
Name[lt]=Ieškoti ir paleisti
|
||||
Name[nl]=Zoeken en uitvoeren
|
||||
Name[pt]=Pesquisar e Executar
|
||||
|
|
@ -11,11 +12,13 @@ Name[pt_BR]=Pesquisar e executar
|
|||
Name[sv]=Sök och kör
|
||||
Name[uk]=Пошук і запуск
|
||||
Name[x-test]=xxSearch And Runxx
|
||||
Name[zh_TW]=搜尋並執行
|
||||
|
||||
Comment=Search and run Applications and services
|
||||
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[lt]=Ieškoti ir paleisti programas bei tarnybas
|
||||
Comment[nl]=Zoeken en uitvoeren van toepassingen en services
|
||||
Comment[pt]=Pesquisa e executa aplicações e serviços
|
||||
|
|
@ -23,6 +26,7 @@ Comment[pt_BR]=Pesquisa e executa aplicativos e serviços
|
|||
Comment[sv]=Sök och kör program och tjänster
|
||||
Comment[uk]=Пошук і запуск програм і служб
|
||||
Comment[x-test]=xxSearch and run Applications and servicesxx
|
||||
Comment[zh_TW]=搜尋並執行應用程式及服務
|
||||
|
||||
Icon=preferences-system-time
|
||||
Type=Service
|
||||
|
|
|
|||
Loading…
Reference in a new issue