Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

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 2022-11-10 01:51:59 +00:00
parent 0de83b700d
commit a486d0fb75
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/AutoScroll/metadata.desktop
View File

@ -32,7 +32,7 @@ Name[ru]=Автопрокрутка
Name[sk]=Automatické posúvanie
Name[sl]=Samodejno drsenje
Name[sv]=Rulla automatiskt
Name[tr]=Otomatik Kaydır
Name[tr]=Otomatik Sarma
Name[uk]=Автогортання
Name[x-test]=xxAutoScrollxx
Name[zh_CN]=自动滚动
@ -69,7 +69,7 @@ Comment[ru]=Предоставляет поддержку автопрокрут
Comment[sk]=Poskytuje podporu pre Automatické posúvanie so stredným tlačidlom myši
Comment[sl]=Omogoča podporo za samodejno drsenje s srednjim gumbom miške
Comment[sv]=Tillhandahåller stöd för automatisk rullning med musens mittenknapp
Comment[tr]=Orta fare düğmesiyle otomatik kaydırma desteği ekler
Comment[tr]=Orta fare düğmesiyle otomatik sarma desteği ekler
Comment[uk]=Забезпечує підтримку автогортання середньою кнопкою миші
Comment[x-test]=xxProvides support for autoscroll with middle mouse buttonxx
Comment[zh_CN]=提供鼠标中键滚动支持