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-16 13:33:29 +00:00
parent a4c8934ee7
commit 0899923dbc
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,18 +2,24 @@
Name=KDE Connect Application Name=KDE Connect Application
Name[ca]=Aplicació KDE Connect Name[ca]=Aplicació KDE Connect
Name[nl]=KDE Connect-toepassing Name[nl]=KDE Connect-toepassing
Name[pt]=Aplicação do KDE Connect
Name[pt_BR]=Aplicativo KDE Connect
Name[sv]=Programmet KDE-anslut Name[sv]=Programmet KDE-anslut
Name[uk]=Програма KDE Connect 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[nl]=Synchronisatie van apparaat GenericName[nl]=Synchronisatie van apparaat
GenericName[pt]=Sincronização de Dispositivos
GenericName[pt_BR]=Sincronização de dispositivo
GenericName[sv]=Enhetssynkronisering GenericName[sv]=Enhetssynkronisering
GenericName[uk]=Синхронізація із пристроями GenericName[uk]=Синхронізація із пристроями
GenericName[x-test]=xxDevice Synchronizationxx GenericName[x-test]=xxDevice Synchronizationxx
Comment=Make all your devices one Comment=Make all your devices one
Comment[ca]=Fa que tots els vostres dispositius siguin un Comment[ca]=Fa que tots els vostres dispositius siguin un
Comment[nl]=Al uw apparaten een maken Comment[nl]=Al uw apparaten een maken
Comment[pt]=Unifique todos os seus dispositivos
Comment[pt_BR]=Torne todos os seus dispositivos em um
Comment[sv]=Gör alla enheter till en Comment[sv]=Gör alla enheter till en
Comment[uk]=Поєднайте усі ваші пристрої Comment[uk]=Поєднайте усі ваші пристрої
Comment[x-test]=xxMake all your devices onexx Comment[x-test]=xxMake all your devices onexx