From 1445b44ce910438a917c5f779b5daf85bf68deea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 10 Jun 2022 01:42:25 +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" --- .../homescreens/halcyon/package/metadata.desktop | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/containments/homescreens/halcyon/package/metadata.desktop b/containments/homescreens/halcyon/package/metadata.desktop index cbf63b85..27fe9c35 100644 --- a/containments/homescreens/halcyon/package/metadata.desktop +++ b/containments/homescreens/halcyon/package/metadata.desktop @@ -5,7 +5,19 @@ Encoding=UTF-8 Keywords= Name=Halcyon +Name[ca]=Halcyon +Name[es]=Halcyon +Name[nl]=Halcyon +Name[tr]=Halikon +Name[uk]=Альціон +Name[x-test]=xxHalcyonxx Description=A mobile homescreen focused on simplicity and ease-of-use. +Description[ca]=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[nl]=Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak. +Description[tr]=Yalınlığa ve kullanım kolaylığına odaklanmış, taşınabilir bir ana ekran. +Description[uk]=Домашній екран для мобільних пристроїв із акцентом на простоті та зручності. +Description[x-test]=xxA mobile homescreen focused on simplicity and ease-of-use.xx Type=Service X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment