From 29d5afaacfc5a5a7850474d3f228ae7098bf7af9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Jul 2022 01:49:14 +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/halcyon/package/metadata.desktop | 2 ++ 2 files changed, 3 insertions(+) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 6f9342b8..1f53de25 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -15,6 +15,7 @@ Name[ia]=Plasma Mobile (Disveloppamento) Name[ko]=Plasma 모바일(개발) Name[nl]=Plasma-mobiel (ontwikkeling) Name[pt]=Plasma Mobile (Desenvolvimento) +Name[pt_BR]=Plasma Mobile (desenvolvimento) Name[sl]=Plasma Mobile (Razvoj) Name[tr]=Plasma Mobile (Geliştirme) Name[uk]=Мобільна Плазма (версія у розробці) diff --git a/containments/homescreens/halcyon/package/metadata.desktop b/containments/homescreens/halcyon/package/metadata.desktop index d354ee21..c2b71c8c 100644 --- a/containments/homescreens/halcyon/package/metadata.desktop +++ b/containments/homescreens/halcyon/package/metadata.desktop @@ -16,6 +16,7 @@ Name[ko]=Halcyon Name[nl]=Halcyon Name[pa]=ਹਲਕਿਆਨ Name[pt]=Halcyon +Name[pt_BR]=Halcyon Name[sl]=Halcyon Name[sv]=Halcyon Name[tr]=Halikon @@ -33,6 +34,7 @@ Description[ko]=간단함과 사용 편의성에 초점을 맞춘 모바일 홈 Description[nl]=Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak. Description[pa]=ਮੋਬਾਈਲ ਮੁੱਖ-ਸਕਰੀਨ, ਜੋ ਕਿ ਸਰਲ ਅਤੇ ਵਰਤਣ ਲਈ ਸੌਖੇ ਟੀਚੇ ਉੱਤੇ ਕੇਂਦਰਿਤ ਹੈ। Description[pt]=Um ecrã inicial para dispositivos móveis focado na simplicidade e facilidade de uso. +Description[pt_BR]=Uma tela inicial móvel focada na simplicidade e facilidade de uso. Description[sl]=Mobilni domači zaslon, enostavnega videza in uporabe. Description[sv]=En hemskärm för mobiler fokuserad på enkelhet och användbarhet. Description[tr]=Yalınlığa ve kullanım kolaylığına odaklanmış, taşınabilir bir ana ekran.