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-26 06:26:12 +01:00
parent 2f63d3aaa1
commit e1a005524e
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

@ -20,6 +20,7 @@ Name[sk]=Hľadať a Spustiť
Name[sv]=Sök och kör
Name[uk]=Пошук і запуск
Name[x-test]=xxSearch And Runxx
Name[zh_CN]=搜索和运行
Name[zh_TW]=搜尋並執行
Comment=Search and run Applications and services
@ -42,6 +43,7 @@ Comment[sk]=Hľadať a spustiť Aplikácie a služby
Comment[sv]=Sök och kör program och tjänster
Comment[uk]=Пошук і запуск програм і служб
Comment[x-test]=xxSearch and run Applications and servicesxx
Comment[zh_CN]=搜索和运行应用程序及服务
Comment[zh_TW]=搜尋並執行應用程式及服務
Icon=preferences-system-time