From b51a575bc6a5be01664f03618e6358dd50e378ee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 9 Sep 2022 01:47:56 +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" --- bin/plasma-mobile-dev.desktop.cmake | 1 + containments/homescreens/default/package/metadata.json | 1 + containments/panel/package/metadata.json | 1 + containments/taskpanel/package/metadata.json | 1 + quicksettings/airplanemode/metadata.json | 1 + quicksettings/bluetooth/metadata.json | 1 - quicksettings/nightcolor/package/metadata.json | 1 + quicksettings/wifi/metadata.json | 1 - shell/metadata.json | 1 + 9 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 983b277c..ebf40132 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -8,6 +8,7 @@ Name=Plasma Mobile (Development) Name[az]=Plasma Mobil (Tərtibat) Name[ca]=Plasma Mobile (Desenvolupament) Name[ca@valencia]=Plasma Mobile (Desenvolupament) +Name[cs]=Plasma Mobile (Vývojová) Name[en_GB]=Plasma Mobile (Development) Name[es]=Plasma Mobile (desarrollo) Name[eu]=Plasma Mugikorra (Garapena) diff --git a/containments/homescreens/default/package/metadata.json b/containments/homescreens/default/package/metadata.json index 55c993d0..1d9b9ab2 100644 --- a/containments/homescreens/default/package/metadata.json +++ b/containments/homescreens/default/package/metadata.json @@ -7,6 +7,7 @@ "Name[az]": "Marco Martin", "Name[ca@valencia]": "Marco Martin", "Name[ca]": "Marco Martin", + "Name[cs]": "Marco Martin", "Name[de]": "Marco Martin", "Name[en_GB]": "Marco Martin", "Name[es]": "Marco Martin", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index d8b9e85b..58b6b8b2 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -7,6 +7,7 @@ "Name[az]": "Marco Martin", "Name[ca@valencia]": "Marco Martin", "Name[ca]": "Marco Martin", + "Name[cs]": "Marco Martin", "Name[de]": "Marco Martin", "Name[en_GB]": "Marco Martin", "Name[es]": "Marco Martin", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index 5bec64f1..ca3e3c6f 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -7,6 +7,7 @@ "Name[az]": "Marco Martin", "Name[ca@valencia]": "Marco Martin", "Name[ca]": "Marco Martin", + "Name[cs]": "Marco Martin", "Name[de]": "Marco Martin", "Name[en_GB]": "Marco Martin", "Name[es]": "Marco Martin", diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index 736c0c6e..352e9291 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -7,6 +7,7 @@ "Name[az]": "Bhushan Shah", "Name[ca@valencia]": "Bhushan Shah", "Name[ca]": "Bhushan Shah", + "Name[cs]": "Bhushan Shah", "Name[de]": "Bhushan Shah", "Name[en_GB]": "Bhushan Shah", "Name[es]": "Bhushan Shah", diff --git a/quicksettings/bluetooth/metadata.json b/quicksettings/bluetooth/metadata.json index f6b4a6d3..e4859f79 100644 --- a/quicksettings/bluetooth/metadata.json +++ b/quicksettings/bluetooth/metadata.json @@ -32,7 +32,6 @@ "Description[az]": "Bluetooth sürətli ayarı", "Description[ca@valencia]": "Configuració ràpida de Bluetooth", "Description[ca]": "Configuració ràpida del Bluetooth", - "Description[cs]": "Rychlé nastavení Bluetooth", "Description[en_GB]": "Bluetooth quick setting", "Description[es]": "Ajuste rápido del Bluetooth", "Description[eu]": "Bluetootharen ezarpen azkarra", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index d60fac14..c4f084e2 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -7,6 +7,7 @@ "Name[az]": "Aleix Pol", "Name[ca@valencia]": "Aleix Pol", "Name[ca]": "Aleix Pol", + "Name[cs]": "Aleix Pol", "Name[de]": "Aleix Pol", "Name[en_GB]": "Aleix Pol", "Name[es]": "Aleix Pol", diff --git a/quicksettings/wifi/metadata.json b/quicksettings/wifi/metadata.json index 162ea292..25e9883d 100644 --- a/quicksettings/wifi/metadata.json +++ b/quicksettings/wifi/metadata.json @@ -32,7 +32,6 @@ "Description[az]": "Wi-Fi sürətli ayarı", "Description[ca@valencia]": "Configuració ràpida de la Wi-Fi", "Description[ca]": "Configuració ràpida de la Wi-Fi", - "Description[cs]": "Rychlé nastavení WiFi", "Description[en_GB]": "Wi-Fi quick setting", "Description[es]": "Ajuste rápido del wifi", "Description[eu]": "Wi-Fi ezarpen azkarra", diff --git a/shell/metadata.json b/shell/metadata.json index 1c4aff85..ae1e7239 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -7,6 +7,7 @@ "Name[az]": "Aaron Seigo", "Name[ca@valencia]": "Aaron Seigo", "Name[ca]": "Aaron Seigo", + "Name[cs]": "Aaron Seigo", "Name[de]": "Aaron Seigo", "Name[en_GB]": "Aaron Seigo", "Name[es]": "Aaron Seigo",