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-10 10:43:22 +00:00
parent e890207d07
commit 2e5b8ae265
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kcm/kcm_kdeconnect.desktop
View file

@ -39,6 +39,14 @@ Name[x-test]=xxKDE Connectxx
Name[zh_CN]=KDE Connect Name[zh_CN]=KDE Connect
Comment=Connect and sync your devices Comment=Connect and sync your devices
Comment[ca]=Connecta i sincronitza els vostres dispositius
Comment[de]=Verbinden und Abgleichen Ihrer Geräte
Comment[gl]=Conecte e sincronice os seus dispositivos.
Comment[nl]=Uw apparaten verbinden en synchroniseren
Comment[pt_BR]=Conecta e sincroniza seus dispositivos
Comment[sv]=Anslut och synkronisera dina apparater
Comment[uk]=З’єднання і синхронізація ваших пристроїв
Comment[x-test]=xxConnect and sync your devicesxx
X-KDE-Keywords=Network,Android,Devices X-KDE-Keywords=Network,Android,Devices
X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства

8
kcm/kdeconnect.desktop
View file

@ -31,5 +31,13 @@ Name[uk]=З’єднання KDE
Name[x-test]=xxKDE Connectxx Name[x-test]=xxKDE Connectxx
Name[zh_CN]=KDE Connect Name[zh_CN]=KDE Connect
GenericName=Connect and sync your devices GenericName=Connect and sync your devices
GenericName[ca]=Connecta i sincronitza els vostres dispositius
GenericName[de]=Verbinden und Abgleichen Ihrer Geräte
GenericName[gl]=Conecte e sincronice os seus dispositivos
GenericName[nl]=Uw apparaten verbinden en synchroniseren
GenericName[pt_BR]=Conecta e sincroniza seus dispositivos
GenericName[sv]=Anslut och synkronisera dina apparater
GenericName[uk]=З’єднання і синхронізація ваших пристроїв
GenericName[x-test]=xxConnect and sync your devicesxx
Categories=Qt;KDE;Settings;HardwareSettings; Categories=Qt;KDE;Settings;HardwareSettings;
NotShowIn=KDE; NotShowIn=KDE;

8
plugins/notifications/kdeconnect_notifications.json
View file

@ -8,6 +8,14 @@
} }
], ],
"Description": "Show phone notifications on your computer and keep them in sync", "Description": "Show phone notifications on your computer and keep them in sync",
"Description[ca]": "Mostra les notificacions del telèfon a l'ordinador i les manté sincronitzades",
"Description[de]": "Benachrichtigungen auf Ihren Rechner anzeigen und abgleichen",
"Description[gl]": "Mostre notificacións dun teléfono móbil no computador e deixe que as notificacións se sincronicen co teléfono.",
"Description[nl]": "Telefoonmeldingen op uw computer tonen en ze gesynchroniseerd houden",
"Description[pt_BR]": "Mostra as notificações do celular no seu computador e as mantém sincronizadas",
"Description[sv]": "Visa telefonunderrättelser på datorn och håll dem synkroniserade",
"Description[uk]": "Показ сповіщень з телефону на вашому комп’ютері та підтримання синхронізації даних сповіщень",
"Description[x-test]": "xxShow phone notifications on your computer and keep them in syncxx",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "preferences-desktop-notification", "Icon": "preferences-desktop-notification",
"Id": "kdeconnect_notifications", "Id": "kdeconnect_notifications",