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-09-09 10:15:45 +00:00
parent c65be84a89
commit a50607939d
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcm/kdeconnect.desktop
View file

@ -8,6 +8,7 @@ Name[nl]=Instellingen van KDE Connect
Name[pt]=Configuração do KDE Connect Name[pt]=Configuração do KDE Connect
Name[pt_BR]=Configurações do KDE Connect Name[pt_BR]=Configurações do KDE Connect
Name[sv]=Inställning av KDE-anslut Name[sv]=Inställning av KDE-anslut
Name[tr]=KDE Bağlantı Ayarları
Name[uk]=Параметри KDE Connect Name[uk]=Параметри KDE Connect
Name[x-test]=xxKDE Connect Settingsxx Name[x-test]=xxKDE Connect Settingsxx
GenericName=Connect and sync your devices GenericName=Connect and sync your devices

2
kdeconnect-non-plasma.desktop
View file

@ -4,6 +4,7 @@ Name[nl]=KDE-Connectmonitor
Name[pt]=Monitor do KDE Connect Name[pt]=Monitor do KDE Connect
Name[pt_BR]=Monitor do KDE Connect Name[pt_BR]=Monitor do KDE Connect
Name[sv]=KDE-anslut övervakning Name[sv]=KDE-anslut övervakning
Name[tr]=KDE Bağlantı İzleyicisi
Name[uk]=Монітор KDE Connect Name[uk]=Монітор KDE Connect
Name[x-test]=xxKDE Connect Monitorxx Name[x-test]=xxKDE Connect Monitorxx
Comment=Display information about your devices Comment=Display information about your devices
@ -11,6 +12,7 @@ Comment[nl]=Toon informatie over uw apparaten
Comment[pt]=Mostrar informações sobre os seus dispositivos Comment[pt]=Mostrar informações sobre os seus dispositivos
Comment[pt_BR]=Mostra informações sobre seus dispositivos Comment[pt_BR]=Mostra informações sobre seus dispositivos
Comment[sv]=Visa information om enheter Comment[sv]=Visa information om enheter
Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin
Comment[uk]=Показати дані щодо ваших пристроїв Comment[uk]=Показати дані щодо ваших пристроїв
Comment[x-test]=xxDisplay information about your devicesxx Comment[x-test]=xxDisplay information about your devicesxx
Exec=plasmawindowed org.kde.kdeconnect --statusnotifier Exec=plasmawindowed org.kde.kdeconnect --statusnotifier