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
323ae5e50b
commit
5d486eca53
1 changed files with 20 additions and 0 deletions
|
|
@ -1,8 +1,28 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Encoding=UTF-8
|
Encoding=UTF-8
|
||||||
Name=Search And Run
|
Name=Search And Run
|
||||||
|
Name[ca]=Cerca i executa
|
||||||
|
Name[es]=Buscar y ejecutar
|
||||||
|
Name[et]=Otsimine ja käivitamine
|
||||||
|
Name[lt]=Ieškoti ir paleisti
|
||||||
|
Name[nl]=Zoeken en uitvoeren
|
||||||
|
Name[pt]=Pesquisar e Executar
|
||||||
|
Name[pt_BR]=Pesquisar e executar
|
||||||
|
Name[sv]=Sök och kör
|
||||||
|
Name[uk]=Пошук і запуск
|
||||||
|
Name[x-test]=xxSearch And Runxx
|
||||||
|
|
||||||
Comment=Search and run Applications and services
|
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[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
|
||||||
|
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
|
||||||
|
|
||||||
Icon=preferences-system-time
|
Icon=preferences-system-time
|
||||||
Type=Service
|
Type=Service
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue