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 2015-06-25 10:38:53 +00:00
parent 6d83827b18
commit 320779b719
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/org.kde.kdeconnect.app.desktop
View file

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect Application Name=KDE Connect Application
Name[ca]=Aplicació KDE Connect Name[ca]=Aplicació KDE Connect
Name[de]=KDE-Connect-Anwendung
Name[fi]=KDE Connect -sovellus Name[fi]=KDE Connect -sovellus
Name[gl]=Programa de KDE Connect Name[gl]=Programa de KDE Connect
Name[nl]=KDE Connect-toepassing Name[nl]=KDE Connect-toepassing
@ -14,6 +15,7 @@ Name[uk]=Програма KDE Connect
Name[x-test]=xxKDE Connect Applicationxx Name[x-test]=xxKDE Connect Applicationxx
GenericName=Device Synchronization GenericName=Device Synchronization
GenericName[ca]=Sincronització de dispositius GenericName[ca]=Sincronització de dispositius
GenericName[de]=Geräteabgleich
GenericName[fi]=Laitteiden synkronointi GenericName[fi]=Laitteiden synkronointi
GenericName[gl]=Sincronización de dispositivos GenericName[gl]=Sincronización de dispositivos
GenericName[nl]=Synchronisatie van apparaat GenericName[nl]=Synchronisatie van apparaat