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 2026-01-29 01:40:16 +00:00
parent 399889eca1
commit fb082759e1
5 changed files with 17 additions and 1 deletions

View file

@ -13,12 +13,14 @@
"Name[fr]": "Luis Büchi",
"Name[he]": "לואי ביושי",
"Name[hu]": "Luis Büchi",
"Name[ia]": "Luis Büchi",
"Name[is]": "Luis Büchi",
"Name[it]": "Luis Büchi",
"Name[ka]": "Luis Büchi",
"Name[ko]": "Luis Büchi",
"Name[nl]": "Luis Büchi",
"Name[pt_BR]": "Luis Büchi",
"Name[ru]": "Luis Büchi",
"Name[sl]": "Luis Büchi",
"Name[sv]": "Luis Büchi",
"Name[tr]": "Luis Büchi",
@ -44,6 +46,7 @@
"Description[ko]": "시스템 탐색 설정",
"Description[nl]": "Systeemnavigatie configureren",
"Description[pt_BR]": "Configurar sistema de navegação",
"Description[ru]": "Настройка навигации в системе",
"Description[sl]": "Konfiguriraj sistemsko navigacijo",
"Description[sv]": "Anpassa systemnavigering",
"Description[tr]": "Sistem dolaşımını yapılandırın",
@ -74,6 +77,7 @@
"Name[ko]": "탐색",
"Name[nl]": "Navigatie",
"Name[pt_BR]": "Navegação",
"Name[ru]": "Навигация",
"Name[sl]": "Navigacija",
"Name[sv]": "Navigering",
"Name[tr]": "Dolaşım",
@ -98,6 +102,7 @@
"X-KDE-Keywords[ko]": "시스템,셸,패널,탐색,제스처",
"X-KDE-Keywords[nl]": "systeem,shell,paneel,navigatie,gebaar",
"X-KDE-Keywords[pt_BR]": "sistema,shell,painel,navegação,gestos",
"X-KDE-Keywords[ru]": "system,shell,panel,navigation,gesture,система,оболочка,панель,навигация,жесты",
"X-KDE-Keywords[sl]": "sistem,shell,kontrolna plošča,navigacija,gesta",
"X-KDE-Keywords[sv]": "system,skal,panel,navigering,gest",
"X-KDE-Keywords[tr]": "sistem,kabuk,panel,dolaşım,gezinme,dolaşma,hareket",

View file

@ -27,7 +27,7 @@
"Description[pa]": "ਸਮਾਂ-ਖੇਤਰ, ਤਾਰੀਖ ਦਿੱਖ",
"Description[pl]": "Strefa czasowa, wyświetlanie daty",
"Description[pt_BR]": "Fuso horário, exibição de datas",
"Description[ru]": "Показ часового пояса и даты",
"Description[ru]": "Часовой пояс, вывод даты",
"Description[sa]": "समयक्षेत्रम्, तिथिप्रदर्शनम्",
"Description[sk]": "Zobrazenie časového pásma, dátumu",
"Description[sl]": "Časovni pas, prikaz datuma",

View file

@ -13,6 +13,7 @@
"Name[fr]": "Florian RICHER",
"Name[he]": "פלוריאן רישה",
"Name[hu]": "Florian RICHER",
"Name[ia]": "Florian RICHER",
"Name[is]": "Florian RICHER",
"Name[it]": "Florian RICHER",
"Name[ka]": "Florian RICHER",
@ -21,6 +22,7 @@
"Name[nl]": "Florian RICHER",
"Name[pl]": "Florian RICHER",
"Name[pt_BR]": "Florian RICHER",
"Name[ru]": "Florian RICHER",
"Name[sl]": "Florian RICHER",
"Name[sv]": "Florian RICHER",
"Name[tr]": "Florian RICHER",
@ -48,6 +50,7 @@
"Description[nl]": "Waydroid-configuratie",
"Description[pl]": "Ustawienia Waydroida",
"Description[pt_BR]": "Configuração do Waydroid",
"Description[ru]": "Настройка Waydroid",
"Description[sl]": "Konfiguracija Waydroid",
"Description[sv]": "Inställning av Waydroid",
"Description[tr]": "Waydroid yapılandırması",
@ -79,6 +82,7 @@
"Name[nl]": "Waydroid-integratie",
"Name[pl]": "Integracja z Waydroid",
"Name[pt_BR]": "Integração com o Waydroid",
"Name[ru]": "Интеграция с Waydroid",
"Name[sl]": "Integracija Waydroid",
"Name[sv]": "Integrering av Waydroid",
"Name[tr]": "Waydroid Tümleştirmesi",
@ -105,6 +109,7 @@
"X-KDE-Keywords[nl]": "waydroid",
"X-KDE-Keywords[pl]": "waydroid",
"X-KDE-Keywords[pt_BR]": "waydroid",
"X-KDE-Keywords[ru]": "waydroid",
"X-KDE-Keywords[sl]": "waydroid",
"X-KDE-Keywords[sv]": "waydroid",
"X-KDE-Keywords[tr]": "waydroid",

View file

@ -15,6 +15,7 @@
"Name[fr]": "Sebastian Kügler",
"Name[he]": "סבסטיאן קיגלר",
"Name[hu]": "Sebastian Kügler",
"Name[ia]": "Sebastian Kügler",
"Name[is]": "Sebastian Kügler",
"Name[it]": "Sebastian Kügler",
"Name[ka]": "სებასტიან კუგლერი",
@ -23,6 +24,7 @@
"Name[nl]": "Sebastian Kügler",
"Name[pl]": "Sebastian Kügler",
"Name[pt_BR]": "Sebastian Kügler",
"Name[ru]": "Sebastian Kügler",
"Name[sl]": "Sebastian Kügler",
"Name[sv]": "Sebastian Kügler",
"Name[tr]": "Sebastian Kügler",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Florian RICHER",
"Name[he]": "פלוריאן רישה",
"Name[hu]": "Florian RICHER",
"Name[ia]": "Florian RICHER",
"Name[is]": "Florian RICHER",
"Name[it]": "Florian RICHER",
"Name[ka]": "Florian RICHER",
@ -22,6 +23,7 @@
"Name[nl]": "Florian RICHER",
"Name[pl]": "Florian RICHER",
"Name[pt_BR]": "Florian RICHER",
"Name[ru]": "Florian RICHER",
"Name[sl]": "Florian RICHER",
"Name[sv]": "Florian RICHER",
"Name[tr]": "Florian RICHER",
@ -48,6 +50,7 @@
"Description[nl]": "Waydroid snelle instelling van audio voor Plasma Mobile",
"Description[pl]": "Szybkie ustawienia Waydroida dla Przenośnej Plazmy",
"Description[pt_BR]": "Configurações rápidas de Waydroid para o Plasma Mobile",
"Description[ru]": "Быстрая настройка Waydroid для Plasma Mobile",
"Description[sl]": "Hitre nastavitve za Plasma Mobile",
"Description[sv]": "Snabbinställning av Waydroid för Plasma mobil",
"Description[tr]": "Plasma Cep Waydroid tez ayarı",
@ -75,6 +78,7 @@
"Name[nl]": "Waydroid",
"Name[pl]": "Waydroid",
"Name[pt_BR]": "Waydroid",
"Name[ru]": "Waydroid",
"Name[sl]": "Waydroid",
"Name[sv]": "Waydroid",
"Name[tr]": "Waydroid",