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 2017-06-06 04:28:16 +02:00
parent 47b4aadaa3
commit 6305de985b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
indicator/org.kde.kdeconnect.nonplasma.desktop
View file

@ -13,6 +13,7 @@ Name[sr@ijekavian]=КДЕ‑конекцијин показатељ
Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj
Name[sr@latin]=KDE‑konekcijin pokazatelj Name[sr@latin]=KDE‑konekcijin pokazatelj
Name[sv]=KDE-anslut indikator Name[sv]=KDE-anslut indikator
Name[tr]=KDE Bağlantı Göstergesi
Name[uk]=Індикатор KDE Connect Name[uk]=Індикатор KDE Connect
Name[x-test]=xxKDE Connect Indicatorxx Name[x-test]=xxKDE Connect Indicatorxx
Comment=Display information about your devices Comment=Display information about your devices