tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests 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 2024-05-12 03:21:11 +00:00
parent d4dbd9a5e5
commit 68678fc698
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/org.kde.kdeconnect.app.desktop
View file

@ -58,7 +58,7 @@ GenericName[ar]=مزامنة الأجهزة
GenericName[az]=Cihazların eyniləşdirilməsi GenericName[az]=Cihazların eyniləşdirilməsi
GenericName[bg]=Синхронизация на устройство GenericName[bg]=Синхронизация на устройство
GenericName[ca]=Sincronització de dispositius GenericName[ca]=Sincronització de dispositius
GenericName[ca@valencia]=Sincronització de dispositius GenericName[ca@valencia]=Sincronitzeu els dispositius
GenericName[cs]=Synchronizace zařízení GenericName[cs]=Synchronizace zařízení
GenericName[da]=Enhedssynkronisering GenericName[da]=Enhedssynkronisering
GenericName[de]=Geräteabgleich GenericName[de]=Geräteabgleich