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 2025-08-26 01:36:15 +00:00
parent ebe17bcd9c
commit 47a930b466
3 changed files with 10 additions and 0 deletions

View file

@ -15,6 +15,7 @@
"Name[it]": "Florian RICHER",
"Name[ka]": "Florian RICHER",
"Name[ko]": "Florian RICHER",
"Name[lv]": "Florian RICHER",
"Name[nl]": "Florian RICHER",
"Name[pt_BR]": "Florian RICHER",
"Name[sl]": "Florian RICHER",
@ -38,6 +39,7 @@
"Description[it]": "Configurazione di Waydroid",
"Description[ka]": "Waydroid-ის მორგება",
"Description[ko]": "Waydroid 설정",
"Description[lv]": "„Waydroid“ konfigurācija",
"Description[nl]": "Waydroid-configuratie",
"Description[pt_BR]": "Configuração do Waydroid",
"Description[sl]": "Konfiguracija Waydroid",
@ -66,6 +68,7 @@
"Name[it]": "Integrazione Waydroid",
"Name[ka]": "ინტეგრაცია Waydroid-თან",
"Name[ko]": "Waydroid 통합",
"Name[lv]": "„Waydroid“ integrācija",
"Name[nl]": "Waydroid-integratie",
"Name[pt_BR]": "Integração com o Waydroid",
"Name[sl]": "Integracija Waydroid",
@ -88,6 +91,7 @@
"X-KDE-Keywords[it]": "waydroid",
"X-KDE-Keywords[ka]": "waydroid",
"X-KDE-Keywords[ko]": "waydroid",
"X-KDE-Keywords[lv]": "waydroid",
"X-KDE-Keywords[nl]": "waydroid",
"X-KDE-Keywords[pt_BR]": "waydroid",
"X-KDE-Keywords[sl]": "waydroid",

View file

@ -12,6 +12,7 @@
"Name[he]": "סבסטיאן קיגלר",
"Name[it]": "Sebastian Kügler",
"Name[ka]": "სებასტიან კუგლერი",
"Name[lv]": "Sebastian Kügler",
"Name[nl]": "Sebastian Kügler",
"Name[pt_BR]": "Sebastian Kügler",
"Name[sl]": "Sebastian Kügler",
@ -30,6 +31,7 @@
"Description[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים",
"Description[it]": "Configurazione rapida dell'OSD per Plasma Mobile",
"Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
"Description[lv]": "„Plasma Mobile“ OSD ekrāna ātrie iestatījumi",
"Description[nl]": "Snelle instelling van OSD opzet van scherm voor Plasma Mobile",
"Description[pt_BR]": "Configurações rápidas de tela OSD para o Plasma Mobile",
"Description[sl]": "Hitra nastavitev zaslona na zaslonu za Plasma Mobile",
@ -49,6 +51,7 @@
"Name[he]": "חיווי על גבי המסך",
"Name[it]": "OSD schermo",
"Name[ka]": "ეკრანის OSD",
"Name[lv]": "Ekrāna OSD",
"Name[nl]": "OSD van scherm",
"Name[pt_BR]": "Tela OSD",
"Name[sl]": "Zaslon na zaslonu",

View file

@ -16,6 +16,7 @@
"Name[it]": "Florian RICHER",
"Name[ka]": "Florian RICHER",
"Name[ko]": "Florian RICHER",
"Name[lv]": "Florian RICHER",
"Name[nl]": "Florian RICHER",
"Name[pt_BR]": "Florian RICHER",
"Name[sl]": "Florian RICHER",
@ -37,6 +38,7 @@
"Description[it]": "Impostazioni rapide di Waydroid per Plasma Mobile",
"Description[ka]": "Waydroid-ის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
"Description[ko]": "Plasma 모바일의 Waydroid 빠른 설정",
"Description[lv]": "„Plasma Mobile“ „Waydroid“ ātrie iestatījumi",
"Description[nl]": "Waydroid snelle instelling van audio voor Plasma Mobile",
"Description[pt_BR]": "Configurações rápidas de Waydroid para o Plasma Mobile",
"Description[sl]": "Hitre nastavitve za Plasma Mobile",
@ -59,6 +61,7 @@
"Name[it]": "Waydroid",
"Name[ka]": "Waydroid",
"Name[ko]": "Waydroid",
"Name[lv]": "Waydroid",
"Name[nl]": "Waydroid",
"Name[pt_BR]": "Waydroid",
"Name[sl]": "Waydroid",