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-04-09 01:15:23 +00:00
parent cfe1cf71b7
commit 3b246e7368
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

@ -71,7 +71,7 @@ GenericName[eu]=Gailuak sinkronizatzea
GenericName[fi]=Laitteiden synkronointi GenericName[fi]=Laitteiden synkronointi
GenericName[fr]=Synchronisation de périphériques GenericName[fr]=Synchronisation de périphériques
GenericName[gl]=Sincronización de dispositivos GenericName[gl]=Sincronización de dispositivos
GenericName[he]=סנכרון מכשיר GenericName[he]=סנכרון מכשירים
GenericName[hu]=Eszközszinkronizáció GenericName[hu]=Eszközszinkronizáció
GenericName[ia]=Synchronisation de dispositivo GenericName[ia]=Synchronisation de dispositivo
GenericName[id]=Sinkronisasi Peranti GenericName[id]=Sinkronisasi Peranti