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-03-21 05:57:10 +01:00
parent 1e1b60a17d
commit d1fdb28198
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

@ -5,6 +5,7 @@ Name[ca]=Cerca i executa
Name[es]=Buscar y ejecutar
Name[et]=Otsimine ja käivitamine
Name[eu]=Bilatu eta exekutatu
Name[fi]=Etsi ja käynnistä
Name[id]=Cari Dan Jalankan
Name[it]=Cerca e avvia
Name[ko]=찾아서 실행하기
@ -25,6 +26,7 @@ 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[fi]=Etsi ja käynnistä sovelluksia ja palveluja
Comment[id]=Cari dan jalankan Aplikasi dan layanan
Comment[it]=Cerca e avvia applicazioni e servizi
Comment[ko]=프로그램과 서비스 찾아서 실행하기