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 2019-10-28 08:52:57 +01:00
parent 2981840026
commit 015672d98f
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

@ -13,7 +13,7 @@ Name[et]=KDE Connecti rakendus
Name[eu]=KDE Connect aplikazioa Name[eu]=KDE Connect aplikazioa
Name[fi]=KDE Connect -sovellus Name[fi]=KDE Connect -sovellus
Name[fr]=Application KDE Connect Name[fr]=Application KDE Connect
Name[gl]=Aplicativo de KDE Connect Name[gl]=Aplicación de KDE Connect
Name[he]=היישום KDE Connect Name[he]=היישום KDE Connect
Name[hu]=KDE Connect alkalmazás Name[hu]=KDE Connect alkalmazás
Name[id]=Aplikasi KDE Connect Name[id]=Aplikasi KDE Connect