marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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 2021-11-16 01:24:30 +00:00
parent b7b963822c
commit a63dcf2d9b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applets/krunner/metadata.desktop
View file

@ -62,7 +62,7 @@ Comment[ro]=Caută și rulează aplicații și servicii
Comment[ru]=Поиск и запуск приложений и служб Comment[ru]=Поиск и запуск приложений и служб
Comment[sk]=Hľadať a spustiť Aplikácie a služby Comment[sk]=Hľadať a spustiť Aplikácie a služby
Comment[sl]=Poišči in poženi program in storitve Comment[sl]=Poišči in poženi program in storitve
Comment[sv]=Sök och kör program och tjänster Comment[sv]=Sök och kör applikationer och tjänster
Comment[uk]=Пошук і запуск програм і служб Comment[uk]=Пошук і запуск програм і служб
Comment[x-test]=xxSearch and run Applications and servicesxx Comment[x-test]=xxSearch and run Applications and servicesxx
Comment[zh_CN]=搜索和运行应用程序及服务 Comment[zh_CN]=搜索和运行应用程序及服务