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-05 04:09:27 +02:00
parent f472243bae
commit 47b4aadaa3
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,10 +3,15 @@ Name=KDE Connect Indicator
Name[ca]=Indicador del KDE Connect Name[ca]=Indicador del KDE Connect
Name[ca@valencia]=Indicador del KDE Connect Name[ca@valencia]=Indicador del KDE Connect
Name[de]=KDE-Connect-Anzeige Name[de]=KDE-Connect-Anzeige
Name[es]=Indicador de KDE Connect
Name[fr]=Indicateur de KDE Connect Name[fr]=Indicateur de KDE Connect
Name[nl]=KDE-Connect indicator Name[nl]=KDE-Connect indicator
Name[pl]=Wskaźnik KDE Connect Name[pl]=Wskaźnik KDE Connect
Name[pt]=Indicador do KDE Connect Name[pt]=Indicador do KDE Connect
Name[sr]=КДЕ‑конекцијин показатељ
Name[sr@ijekavian]=КДЕ‑конекцијин показатељ
Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj
Name[sr@latin]=KDE‑konekcijin pokazatelj
Name[sv]=KDE-anslut indikator Name[sv]=KDE-anslut indikator
Name[uk]=Індикатор KDE Connect Name[uk]=Індикатор KDE Connect
Name[x-test]=xxKDE Connect Indicatorxx Name[x-test]=xxKDE Connect Indicatorxx