From 08df418cc955eb83ebb51a20c70d9bac6cdc3010 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 21 Mar 2020 09:48:57 +0100 Subject: [PATCH] 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" --- plugins/findmyphone/kdeconnect_findmyphone.json | 2 +- plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index c412649d0..aaa97b1d0 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -107,7 +107,7 @@ "Description[nn]": "Finn telefonen ved å la han spela eit lydsignal", "Description[pl]": "Znajdź twój zgubiony telefon odgrywając na nim dźwięk", "Description[pt]": "Descobrir o seu telefone perdido, fazendo-o tocar um som de alarme", - "Description[pt_BR]": "Encontre seu telefone fazendo ele reproduzir um som", + "Description[pt_BR]": "Encontre seu telefone fazendo-o reproduzir um som", "Description[ru]": "Поиск утерянного телефона при помощи звукового сигнала", "Description[sk]": "Nájsť váš stratený telefón zahraním zvuku budíka", "Description[sr@ijekavian]": "Нађите изгубљени телефон активирањем звука аларма", diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index 4f43ae757..09b0d6c1a 100644 --- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json +++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json @@ -66,7 +66,7 @@ "Description[nn]": "Bruk tastaturet til å senda tastetrykk til den para eininga", "Description[pl]": "Użyj swojej klawiatury do wysyłania naciśnięć klawiszy do swojego sparowanego urządzenia", "Description[pt]": "Usar o seu teclado para enviar eventos de teclas para o seu dispositivo emparelhado", - "Description[pt_BR]": "Use seu teclado para enviar eventos chace ao seu dispositivo pareado", + "Description[pt_BR]": "Use seu teclado para enviar eventos de teclas ao dispositivo pareado", "Description[ru]": "Используйте клавиатуру для отправки нажатий клавиш на сопряжённое устройство", "Description[sk]": "Používajte vašu klávesnicu na posielanie stlačení klávesov do párovaných zariadení", "Description[sr@ijekavian]": "Користите тастатуру за куцање на упареном уређају",