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 2020-02-13 05:56:01 +01:00
parent 423aeebc55
commit 426b33533a
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

@ -9,6 +9,7 @@ Name[lt]=Ieškoti ir paleisti
Name[nl]=Zoeken en uitvoeren Name[nl]=Zoeken en uitvoeren
Name[pt]=Pesquisar e Executar Name[pt]=Pesquisar e Executar
Name[pt_BR]=Pesquisar e executar Name[pt_BR]=Pesquisar e executar
Name[ru]=Поиск и запуск
Name[sk]=Hľadať a Spustiť Name[sk]=Hľadať a Spustiť
Name[sv]=Sök och kör Name[sv]=Sök och kör
Name[uk]=Пошук і запуск Name[uk]=Пошук і запуск
@ -24,6 +25,7 @@ Comment[lt]=Ieškoti ir paleisti programas bei tarnybas
Comment[nl]=Zoeken en uitvoeren van toepassingen en services Comment[nl]=Zoeken en uitvoeren van toepassingen en services
Comment[pt]=Pesquisa e executa aplicações e serviços Comment[pt]=Pesquisa e executa aplicações e serviços
Comment[pt_BR]=Pesquisa e executa aplicativos e serviços Comment[pt_BR]=Pesquisa e executa aplicativos e serviços
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[sv]=Sök och kör program och tjänster Comment[sv]=Sök och kör program och tjänster
Comment[uk]=Пошук і запуск програм і служб Comment[uk]=Пошук і запуск програм і служб