From dd999334f88365034d36367ca04cf91789d02c05 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Feb 2021 07:43:24 +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 | 4 ++-- plugins/mousepad/kdeconnect_mousepad.json | 2 +- plugins/systemvolume/kdeconnect_systemvolume.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index d72878d4f..0ef19b4f5 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -115,7 +115,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-o reproduzir um som", + "Description[pt_BR]": "Encontre seu celular fazendo-o reproduzir um som", "Description[ro]": "Găsiți telefonul pierdut făcându-l să sune o alarmă", "Description[ru]": "Поиск утерянного телефона при помощи звукового сигнала", "Description[sk]": "Nájdenie vášho strateného telefónu prehraním výstražného zvuku", @@ -159,7 +159,7 @@ "Name[nn]": "Ring telefonen", "Name[pl]": "Dzwonienie telefonem", "Name[pt]": "Tocar o meu telefone", - "Name[pt_BR]": "Tocar meu telefone", + "Name[pt_BR]": "Tocar meu celular", "Name[ro]": "Sună-mi telefonul", "Name[ru]": "Поиск телефона", "Name[sk]": "Prezvoniť môj telefón", diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json index 73f817687..e6ceb1d0d 100644 --- a/plugins/mousepad/kdeconnect_mousepad.json +++ b/plugins/mousepad/kdeconnect_mousepad.json @@ -73,7 +73,7 @@ "Description[nn]": "Bruk telefonen som styreplate og tastatur", "Description[pl]": "Używaj swojego telefonu jako gładzika i klawiatury", "Description[pt]": "Use o seu telefone como um rato e teclado por toque", - "Description[pt_BR]": "Use seu telefone como um touchpad e teclado", + "Description[pt_BR]": "Use seu celular como um touchpad e teclado", "Description[ro]": "Folosiți telefonul ca zonă tactilă și tastatură", "Description[ru]": "Использование телефона в качестве сенсорной панели и клавиатуры", "Description[sk]": "Použitie vášho telefónu ako touchpad a klávesnica", diff --git a/plugins/systemvolume/kdeconnect_systemvolume.json b/plugins/systemvolume/kdeconnect_systemvolume.json index 0c93955ec..4d0ff78e3 100644 --- a/plugins/systemvolume/kdeconnect_systemvolume.json +++ b/plugins/systemvolume/kdeconnect_systemvolume.json @@ -65,7 +65,7 @@ "Description[nn]": "Juster systemlydstyrken frå telefonen", "Description[pl]": "Steruj głośnością systemu z telefonu", "Description[pt]": "Controle o volume do sistema a partir do seu telemóvel", - "Description[pt_BR]": "Controle o volume do sistema com o seu telefone", + "Description[pt_BR]": "Controle o volume do sistema com o seu celular", "Description[ro]": "Controlează volumul sistemului de pe telefon", "Description[ru]": "Управление громкостью компьютера с подключённого устройства", "Description[sk]": "Ovládanie systémovej hlasitosti z vášho telefónu",