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"
This commit is contained in:
l10n daemon script 2023-03-07 02:40:31 +00:00
parent 847529751e
commit 7d410d2fdb
3 changed files with 10 additions and 6 deletions

View file

@ -1,22 +1,20 @@
{
"KPackageStructure": "KWin/Script",
"KPlugin": {
"Name": "Convergent Windows",
"Description": "Removes window decorations and maximizes windows on the first screen only.",
"Icon": "preferences-system-windows",
"Authors": [
{
"Email": "plata.hill@kdemail.net",
"Name": "Plata Hill"
}
],
"Description": "Removes window decorations and maximizes windows on the first screen only.",
"Icon": "preferences-system-windows",
"Id": "convergentwindows",
"Version": "1.0",
"Licsense": "LGPL-2.1-or-later",
"Name": "Convergent Windows",
"Version": "1.0",
"Website": "https://invent.kde.org/plata/convergentwindows"
},
"X-Plasma-API": "javascript",
"X-Plasma-MainScript": "code/main.js"
}

View file

@ -5,6 +5,7 @@
{
"Email": "plasma-mobile@kde.org",
"Name": "KDE Visual Design Group",
"Name[ca@valencia]": "Grup de disseny visual de KDE",
"Name[ca]": "Grup de disseny visual de KDE",
"Name[es]": "El grupo de diseño visual de KDE",
"Name[eu]": "KDE Ikus-diseinu taldea",
@ -20,6 +21,7 @@
],
"Category": "",
"Description": "Plasma for mobile devices",
"Description[ca@valencia]": "Plasma per a dispositius mòbils",
"Description[ca]": "Plasma per a dispositius mòbils",
"Description[es]": "Plasma para dispositivos móviles",
"Description[eu]": "Plasma gailu mugikorretarako",
@ -34,6 +36,7 @@
"Id": "org.kde.breeze.mobile",
"License": "GPLv2+",
"Name": "Plasma Mobile Breeze",
"Name[ca@valencia]": "Plasma Mobile Brisa",
"Name[ca]": "Plasma Mobile Brisa",
"Name[es]": "Brisa de Plasma Mobile",
"Name[eu]": "Plasma Mugikorra Breeze",

View file

@ -5,6 +5,7 @@
{
"Email": "skilvingr@gmail.com",
"Name": "Yari Polla",
"Name[ca@valencia]": "Yari Polla",
"Name[ca]": "Yari Polla",
"Name[es]": "Yari Polla",
"Name[eu]": "Yari Polla",
@ -20,6 +21,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[es]": "Ajuste rápido del punto de acceso para Plasma Mobile",
"Description[eu]": "Berogunearen ezarpen azkarra Plasma Mugikorrerako",
@ -36,6 +38,7 @@
"Id": "org.kde.plasma.quicksetting.hotspot",
"License": "GPL-2.0+",
"Name": "Hotspot",
"Name[ca@valencia]": "Punt d'accés",
"Name[ca]": "Punt d'accés",
"Name[es]": "Punto de acceso",
"Name[eu]": "Berogunea",