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-12-02 09:13:11 +01:00
parent 8525f07c74
commit 7f37d7934d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ Name[pl]=Wskaźnik KDE Connect
Name[pt]=Indicador do KDE Connect
Name[pt_BR]=Indicador do KDE Connect
Name[ru]=Индикатор KDE Connect
Name[sk]=Ukozaovateľ KDE Connect
Name[sk]=KDE Connect Indikátor
Name[sr]=КДЕ‑конекцијин показатељ
Name[sr@ijekavian]=КДЕ‑конекцијин показатељ
Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj