SVN_SILENT made messages (.desktop file) - always resolve ours

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-01 12:31:29 +00:00
parent 2b34d28d6f
commit e6a759a071
7 changed files with 12 additions and 0 deletions

View file

@ -16,6 +16,7 @@ Name[sv]=Programmet KDE-anslut
Name[tr]=KDE Bağlantı Uygulaması
Name[uk]=Програма KDE Connect
Name[x-test]=xxKDE Connect Applicationxx
Name[zh_CN]=KDE Connect
GenericName=Device Synchronization
GenericName[ca]=Sincronització de dispositius
GenericName[cs]=Synchronizace zařízení
@ -33,6 +34,7 @@ GenericName[sv]=Enhetssynkronisering
GenericName[tr]=Aygıt Eşzamanlaması
GenericName[uk]=Синхронізація із пристроями
GenericName[x-test]=xxDevice Synchronizationxx
GenericName[zh_CN]=
Comment=Make all your devices one
Comment[ca]=Fa que tots els vostres dispositius siguin un
Comment[cs]=Sjednoťte svá zařízení
@ -50,6 +52,7 @@ Comment[sv]=Gör alla enheter till en
Comment[tr]=Tüm aygıtlarınızı birleştirin
Comment[uk]=Поєднайте усі ваші пристрої
Comment[x-test]=xxMake all your devices onexx
Comment[zh_CN]=
Exec=kcapp
Icon=kdeconnect
Type=Application

View file

@ -55,6 +55,7 @@ Comment[sv]=Anslut och synkronisera dina apparater
Comment[tr]=Aygıtlarınıza bağlanın ve eşitleyin
Comment[uk]=Зєднання і синхронізація ваших пристроїв
Comment[x-test]=xxConnect and sync your devicesxx
Comment[zh_CN]=
X-KDE-Keywords=Network,Android,Devices
X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства

View file

@ -47,5 +47,6 @@ GenericName[sv]=Anslut och synkronisera dina apparater
GenericName[tr]=Aygıtlarınıza bağlanın ve eşitleyin
GenericName[uk]=Зєднання і синхронізація ваших пристроїв
GenericName[x-test]=xxConnect and sync your devicesxx
GenericName[zh_CN]=
Categories=Qt;KDE;Settings;HardwareSettings;
NotShowIn=KDE;

View file

@ -24,6 +24,7 @@
"Description[tr]": "Sistemlerinizi kilitler",
"Description[uk]": "Блокує вашу систему",
"Description[x-test]": "xxLocks your systemsxx",
"Description[zh_CN]": "锁定您的系统",
"EnabledByDefault": true,
"Icon": "applications-miscelaneaous",
"Id": "kdeconnect_lockdevice",
@ -45,6 +46,7 @@
"Name[tr]": "AygıtıKilitle",
"Name[uk]": "LockDevice",
"Name[x-test]": "xxLockDevicexx",
"Name[zh_CN]": "锁定设备",
"ServiceTypes": [
"KdeConnect/Plugin"
],

View file

@ -24,6 +24,7 @@
"Description[tr]": "MPRIS servislerini kontrol et",
"Description[uk]": "Керування службами MPRIS",
"Description[x-test]": "xxControl MPRIS servicesxx",
"Description[zh_CN]": "控制 MPRIS 服务",
"EnabledByDefault": true,
"Icon": "applications-multimedia",
"Id": "kdeconnect_mprisremote",
@ -45,6 +46,7 @@
"Name[tr]": "MprisRemote",
"Name[uk]": "MprisRemote",
"Name[x-test]": "xxMprisRemotexx",
"Name[zh_CN]": "远程 Mpris",
"ServiceTypes": [
"KdeConnect/Plugin"
],

View file

@ -24,6 +24,7 @@
"Description[tr]": "Telefon bildirimlerini bilgisayarınızla eşitler ve eşzamanlı tutar",
"Description[uk]": "Показ сповіщень з телефону на вашому комп’ютері та підтримання синхронізації даних сповіщень",
"Description[x-test]": "xxShow phone notifications on your computer and keep them in syncxx",
"Description[zh_CN]": "在电脑显示手机通知并保持同步",
"EnabledByDefault": true,
"Icon": "preferences-desktop-notification",
"Id": "kdeconnect_notifications",

View file

@ -23,6 +23,7 @@
"Description[tr]": "Uzak Sistemleri Kontrol Et",
"Description[uk]": "Системи віддаленого керування",
"Description[x-test]": "xxControl Remote systemsxx",
"Description[zh_CN]": "控制远程系统",
"EnabledByDefault": true,
"Icon": "applications-multimedia",
"Id": "kdeconnect_remotecontrol",
@ -43,6 +44,7 @@
"Name[tr]": "UzaktanKumanda",
"Name[uk]": "RemoteControl",
"Name[x-test]": "xxRemoteControlxx",
"Name[zh_CN]": "远程控制",
"ServiceTypes": [
"KdeConnect/Plugin"
],