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-07-21 15:07:44 +00:00
parent ca1d99e261
commit a794d51c4e
4 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcm/kcm_kdeconnect.desktop
View file

@ -75,7 +75,7 @@ X-KDE-Keywords[nl]=Netwerk,Android,Apparaten
X-KDE-Keywords[pl]=Sieć,Android,Urządzenia X-KDE-Keywords[pl]=Sieć,Android,Urządzenia
X-KDE-Keywords[pt]=Rede,Android,Dispositivos X-KDE-Keywords[pt]=Rede,Android,Dispositivos
X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos
X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид, устройства X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид,устройства
X-KDE-Keywords[sk]=Sieť,Android,Zariadenia X-KDE-Keywords[sk]=Sieť,Android,Zariadenia
X-KDE-Keywords[sv]=Nätverk, Android, apparater X-KDE-Keywords[sv]=Nätverk, Android, apparater
X-KDE-Keywords[tr]=Ağ,Android,Cihazlar,Aygıtlar X-KDE-Keywords[tr]=Ağ,Android,Cihazlar,Aygıtlar

1
plugins/battery/kdeconnect_battery.json
View file

@ -45,6 +45,7 @@
"Name[pl]": "Monitor baterii", "Name[pl]": "Monitor baterii",
"Name[pt]": "Monitor da bateria", "Name[pt]": "Monitor da bateria",
"Name[pt_BR]": "Monitor de bateria", "Name[pt_BR]": "Monitor de bateria",
"Name[ru]": "Индикатор батареи",
"Name[sk]": "Monitor batérie", "Name[sk]": "Monitor batérie",
"Name[sv]": "Batteriövervakare", "Name[sv]": "Batteriövervakare",
"Name[tr]": "Pil izleyici", "Name[tr]": "Pil izleyici",

1
plugins/clipboard/kdeconnect_clipboard.json
View file

@ -45,6 +45,7 @@
"Name[pl]": "Schowek", "Name[pl]": "Schowek",
"Name[pt]": "Área de Transferência", "Name[pt]": "Área de Transferência",
"Name[pt_BR]": "Área de transferência", "Name[pt_BR]": "Área de transferência",
"Name[ru]": "Буфер обмена",
"Name[sk]": "Schránka", "Name[sk]": "Schránka",
"Name[sv]": "Klippbord", "Name[sv]": "Klippbord",
"Name[tr]": "Geçici taşıma panosu", "Name[tr]": "Geçici taşıma panosu",

1
plugins/notifications/kdeconnect_notifications.json
View file

@ -42,6 +42,7 @@
"Name[pl]": "Powiadomienia synchronizacji", "Name[pl]": "Powiadomienia synchronizacji",
"Name[pt]": "Sincronização de notificações", "Name[pt]": "Sincronização de notificações",
"Name[pt_BR]": "Sincronização de notificações", "Name[pt_BR]": "Sincronização de notificações",
"Name[ru]": "Синхронизация уведомлений",
"Name[sk]": "Synchronizácia pripomienok", "Name[sk]": "Synchronizácia pripomienok",
"Name[sv]": "Underrättelsesynkronisering", "Name[sv]": "Underrättelsesynkronisering",
"Name[tr]": "Bildirim eşitleme", "Name[tr]": "Bildirim eşitleme",