From 5a9802ae5fad84d7c3bc0eac0290996644fcb097 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Jul 2022 01:46:57 +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 1f53de25..7301bd74 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -10,6 +10,7 @@ Name[ca]=Plasma Mobile (Desenvolupament) Name[ca@valencia]=Plasma Mobile (Desenvolupament) Name[es]=Plasma Mobile (desarrollo) Name[eu]=Plasma Mugikorra (Garapena) +Name[fi]=Plasma Mobile (kehitys) Name[fr]=Plasma Mobile (Développement) Name[ia]=Plasma Mobile (Disveloppamento) Name[ko]=Plasma 모바일(개발) diff --git a/containments/homescreens/halcyon/package/metadata.desktop b/containments/homescreens/halcyon/package/metadata.desktop index c2b71c8c..403c7453 100644 --- a/containments/homescreens/halcyon/package/metadata.desktop +++ b/containments/homescreens/halcyon/package/metadata.desktop @@ -10,6 +10,7 @@ Name[ca]=Halcyon Name[ca@valencia]=Halcyon Name[es]=Halcyon Name[eu]=Halcyon +Name[fi]=Halcyon Name[fr]=Halcyon Name[ia]=Halcyon Name[ko]=Halcyon @@ -29,6 +30,7 @@ Description[ca]=Una pantalla d'inici del mòbil enfocada a la senzillesa i facil Description[ca@valencia]=Una pantalla d'inici del mòbil enfocada a la senzillesa i facilitat d'ús. Description[es]=Pantalla de inicio para móvil centrada en la simplicidad y en la facilidad de uso. Description[eu]=Sinpletasuna eta erabilerraztasuna helburu duen mugikorrerako etxeko pantaila bat. +Description[fi]=Yksinkertaisuuteen ja helppokäyttöisyyteen keskittyvä mobiilikotinäyttö. Description[fr]=Un écran d'accueil pour périphérique mobile, centré sur la simplicité et la facilité d'utilisation. Description[ko]=간단함과 사용 편의성에 초점을 맞춘 모바일 홈 화면입니다. Description[nl]=Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak.