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 2018-01-28 05:06:41 +01:00
parent 45a70473f7
commit ab006521f8
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcm/kcm_kdeconnect.desktop
View file

@ -112,7 +112,7 @@ X-KDE-Keywords[hu]=Hálózat,Android,Eszközök
X-KDE-Keywords[it]=Rete,Android,Dispositivi
X-KDE-Keywords[ko]=Network,Android,Devices,네트워크,안드로이드,장치
X-KDE-Keywords[nl]=Netwerk,Android,Apparaten
X-KDE-Keywords[nn]=nettverk,Android,einingar
X-KDE-Keywords[nn]=nettverk,Android,einingar,smarttelefon
X-KDE-Keywords[pl]=Sieć,Android,Urządzenia
X-KDE-Keywords[pt]=Rede,Android,Dispositivos
X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos

6
plugins/kdeconnect.notifyrc
View file

@ -105,7 +105,7 @@ Name[hu]=Párosítási kérés
Name[it]=Richiesta di associazione
Name[ko]=연결 요청
Name[nl]=Verzoek om een paar te maken
Name[nn]=Parringsførespurnad
Name[nn]=Paringsførespurnad
Name[pl]=Żądanie parowania
Name[pt]=Pedido de Emparelhamento
Name[pt_BR]=Solicitação de emparelhamento
@ -141,7 +141,7 @@ Comment[he]=התקבלה בקשת התאמה מהתקן
Comment[it]=Richiesta di associazione ricevuta da un dispositivo
Comment[ko]=장치에서 연결 요청을 받음
Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
Comment[nn]=Fekk parringsførespurnad frå eining
Comment[nn]=Fekk paringsførespurnad frå eining
Comment[pl]=Otrzymano żądanie parowania z urządzenia
Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo
@ -384,7 +384,7 @@ Comment[hu]=Valaki SMS-t küldött önnek
Comment[it]=Hai ricevuto un SMS
Comment[ko]=누군가가 문자 메시지를 보냄
Comment[nl]=Iemand heeft u een SMS gestuurd
Comment[nn]=Noko sende deg ein SMS
Comment[nn]=Nokon sende deg ein SMS
Comment[pl]=Ktoś do ciebie wysłał SMSa
Comment[pt]=Alguém lhe enviou um SMS
Comment[pt_BR]=Alguém lhe enviou um SMS

2
plugins/pausemusic/kdeconnect_pausemusic_config.desktop
View file

@ -28,7 +28,7 @@ Name[hu]=Zene szüneteltetése bővítmény beállításai
Name[it]=Impostazioni estensione Sospendi musica
Name[ko]=음악 일시 정지 플러그인 설정
Name[nl]=Plug-in-instellingen voor muziek pauzeren
Name[nn]=Innstillingar for tillegg for pausing av musikk
Name[nn]=Innstillingar for pausing av musikk
Name[pl]=Ustawienia wtyczki wstrzymywania muzyki
Name[pt]=Configuração do 'plugin' de Pausa da Música
Name[pt_BR]=Pausar as configurações do plugin Músicas

2
plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
View file

@ -25,7 +25,7 @@ Name[he]=הגדרת התוסף סנכרון התראות
Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
Name[ko]=알림 동기화 플러그인 설정
Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen
Name[nn]=Innstillingar for tillegg for synkronisering av varslingar
Name[nn]=Innstillingar for synkronisering av varslingar
Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia
Name[pt]=Configuração do 'plugin' de sincronização das notificações
Name[pt_BR]=Configuração do plugin de sincronização das notificações

2
plugins/share/kdeconnect_share_config.desktop
View file

@ -28,7 +28,7 @@ Name[hu]=Megosztás bővítmény beállításai
Name[it]=Impostazioni estensione Condivisione
Name[ko]=공유 플러그인 설정
Name[nl]=Plug-in-instellingen van delen
Name[nn]=Innstillingar for tillegg for deling
Name[nn]=Innstillingar for deling
Name[pl]=Ustawienia wtyczki udostępniania
Name[pt]=Configuração do 'plugin' de partilha
Name[pt_BR]=Compartilhar as configurações do plugin