marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +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-07-22 06:12:54 +02:00
parent a5d1f4d880
commit b79e4f302b
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

@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Search And Run
Name[ca]=Cerca i executa
Name[cs]=Vyhledat a spustit
Name[da]=Søg og kør
Name[de]=Suchen und Ausführen
Name[en_GB]=Search And Run
Name[es]=Buscar y ejecutar
@ -30,6 +31,7 @@ Name[zh_TW]=搜尋並執行
Comment=Search and run Applications and services
Comment[ca]=Cerca i executa aplicacions i serveis
Comment[cs]=Vyhledat a spustit aplikace a služby
Comment[da]=Søg og kør programmer og tjenester
Comment[de]=Anwendungen und Dienste suchen und ausführen
Comment[en_GB]=Search and run Applications and services
Comment[es]=Buscar y ejecutar aplicaciones y servicios