From 8ba56dc286435a67e041ea35e13857c2572457f2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 10 Mar 2023 02:43:40 +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" --- kwin/scripts/convergentwindows/metadata.json | 2 ++ look-and-feel/metadata.json | 3 +++ quicksettings/hotspot/metadata.json | 3 +++ 3 files changed, 8 insertions(+) diff --git a/kwin/scripts/convergentwindows/metadata.json b/kwin/scripts/convergentwindows/metadata.json index 065c1c62..20e6eb35 100644 --- a/kwin/scripts/convergentwindows/metadata.json +++ b/kwin/scripts/convergentwindows/metadata.json @@ -7,6 +7,7 @@ "Name": "Plata Hill", "Name[ca@valencia]": "Plata Hill", "Name[ca]": "Plata Hill", + "Name[cs]": "Plata Hill", "Name[es]": "Plata Hill", "Name[fr]": "Plata Hill", "Name[ka]": "Plata Hill", @@ -20,6 +21,7 @@ "Description": "Removes window decorations and maximizes windows on the first screen only.", "Description[ca@valencia]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.", "Description[ca]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.", + "Description[cs]": "Odstraní dekorace oken a maximalizuje je pouze na první obrazovce.", "Description[es]": "Elimina las decoraciones de las ventanas y maximiza las ventanas solo en la primera pantalla.", "Description[fr]": "Supprime les décorations de fenêtres et maximise les fenêtres sur le premier écran uniquement.", "Description[ka]": "ფანჯრების მთელ ეკრანზე გაშლა და დეკორაციების მოცილება მხოლოდ პირველ ეკრანზე", diff --git a/look-and-feel/metadata.json b/look-and-feel/metadata.json index 7e1b3f37..af5f8e71 100644 --- a/look-and-feel/metadata.json +++ b/look-and-feel/metadata.json @@ -7,6 +7,7 @@ "Name": "KDE Visual Design Group", "Name[ca@valencia]": "Grup de disseny visual de KDE", "Name[ca]": "Grup de disseny visual de KDE", + "Name[cs]": "Skupina vizuálního návrhu KDE", "Name[es]": "El grupo de diseño visual de KDE", "Name[eu]": "KDE Ikus-diseinu taldea", "Name[fr]": "Groupe de conception graphique de KDE", @@ -24,6 +25,7 @@ "Description": "Plasma for mobile devices", "Description[ca@valencia]": "Plasma per a dispositius mòbils", "Description[ca]": "Plasma per a dispositius mòbils", + "Description[cs]": "Plasma pro mobilní telefony", "Description[es]": "Plasma para dispositivos móviles", "Description[eu]": "Plasma gailu mugikorretarako", "Description[fr]": "Plasma pour périphériques mobiles", @@ -40,6 +42,7 @@ "Name": "Plasma Mobile Breeze", "Name[ca@valencia]": "Plasma Mobile Brisa", "Name[ca]": "Plasma Mobile Brisa", + "Name[cs]": "Plasma Mobile Breeze", "Name[es]": "Brisa de Plasma Mobile", "Name[eu]": "Plasma Mugikorra Breeze", "Name[fr]": "Thème « Breeze » pour Plasma Mobile", diff --git a/quicksettings/hotspot/metadata.json b/quicksettings/hotspot/metadata.json index ccb0fb1d..245465d0 100644 --- a/quicksettings/hotspot/metadata.json +++ b/quicksettings/hotspot/metadata.json @@ -7,6 +7,7 @@ "Name": "Yari Polla", "Name[ca@valencia]": "Yari Polla", "Name[ca]": "Yari Polla", + "Name[cs]": "Yari Polla", "Name[es]": "Yari Polla", "Name[eu]": "Yari Polla", "Name[fr]": "Yari Polla", @@ -23,6 +24,7 @@ "Description": "Hotspot quick setting for Plasma Mobile", "Description[ca@valencia]": "Configuració ràpida del punt d'accés per a Plasma Mobile", "Description[ca]": "Configuració ràpida del punt d'accés per al Plasma Mobile", + "Description[cs]": "Rychlé nastavení Plasma pro mobilní telefony", "Description[es]": "Ajuste rápido del punto de acceso para Plasma Mobile", "Description[eu]": "Berogunearen ezarpen azkarra Plasma Mugikorrerako", "Description[fr]": "Configuration rapide pour les points d'accès sous Plasma Mobile", @@ -40,6 +42,7 @@ "Name": "Hotspot", "Name[ca@valencia]": "Punt d'accés", "Name[ca]": "Punt d'accés", + "Name[cs]": "Hotspot", "Name[es]": "Punto de acceso", "Name[eu]": "Berogunea", "Name[fr]": "Points d'accès",