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 2022-04-07 02:54:33 +00:00
parent 5c189b2314
commit 47ff0d39bf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/org.kde.kdeconnect-settings.desktop
View file

@ -8,7 +8,7 @@ Name[ar]=إعدادات كدي المتّصل
Name[ast]=Axustes de KDE Connect Name[ast]=Axustes de KDE Connect
Name[az]=KDE Connect Ayarları Name[az]=KDE Connect Ayarları
Name[ca]=Arranjament del KDE Connect Name[ca]=Arranjament del KDE Connect
Name[ca@valencia]=Arranjament de KDE Connect Name[ca@valencia]=Configuració de KDE Connect
Name[cs]=Nastavení KDE Connect Name[cs]=Nastavení KDE Connect
Name[da]=Indstilling af KDE Connect Name[da]=Indstilling af KDE Connect
Name[de]=KDE Connect-Einstellungen Name[de]=KDE Connect-Einstellungen