From f7ed3ac9f7c7c9e256cdbed332ad90b39af084c0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 5 Feb 2022 01:46:06 +0000
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"
---
 plasma_phone_components.notifyrc                  | 3 +++
 quicksettings/airplanemode/metadata.desktop       | 1 +
 quicksettings/nightcolor/package/metadata.desktop | 1 +
 3 files changed, 5 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 94864b5c..7721ab08 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -24,6 +24,7 @@ Name[pa]=ਪਲਾਜ਼ਮਾ
 Name[pl]=Plazma
 Name[pt]=Plasma
 Name[pt_BR]=Plasma
+Name[ro]=Plasma
 Name[ru]=Plasma
 Name[sk]=Plasma
 Name[sl]=Plasma
@@ -53,6 +54,7 @@ Name[pa]=ਕੈਪਚਰ ਕੀਤਾ
 Name[pl]=Przechwycono
 Name[pt]=Capturada
 Name[pt_BR]=Capturado
+Name[ro]=Capturat
 Name[sk]=Zachytené
 Name[sl]=Zajeto
 Name[sv]=Lagrad
@@ -79,6 +81,7 @@ Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ
 Comment[pl]=Przechwycono
 Comment[pt]=Capturada
 Comment[pt_BR]=Capturado
+Comment[ro]=Capturat
 Comment[sk]=Zachytené
 Comment[sl]=Zajeto
 Comment[sv]=Lagrad
diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index 15c8a2c2..d857eebb 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -22,6 +22,7 @@ Name[pa]=ਏਅਰਪਲੇਨ ਮੋਡ
 Name[pl]=Tryb samolotowy
 Name[pt]=Modo de Avião
 Name[pt_BR]=Modo avião
+Name[ro]=Regim de avion
 Name[ru]=Режим полёта
 Name[sl]=Letalski način
 Name[sv]=Flygplansläge
diff --git a/quicksettings/nightcolor/package/metadata.desktop b/quicksettings/nightcolor/package/metadata.desktop
index 78eca7b3..89629cb0 100644
--- a/quicksettings/nightcolor/package/metadata.desktop
+++ b/quicksettings/nightcolor/package/metadata.desktop
@@ -22,6 +22,7 @@ Name[pa]=ਰਾਤ ਦੇ ਰੰਗ
 Name[pl]=Barwy nocne
 Name[pt]=Cor Nocturna
 Name[pt_BR]=Cor noturna
+Name[ro]=Culoare nocturnă
 Name[ru]=Ночная цветовая схема
 Name[sk]=Nočná farba
 Name[sl]=Nočna barva