From d5df7336e1f626485582bebada005bf9999ea374 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 Sep 2025 01:41:43 +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" --- .../waydroidintegrationplugin/kauth/waydroidhelper.actions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions index 9efed6a3..4a55747d 100644 --- a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions +++ b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions @@ -126,6 +126,7 @@ Name[ca]=Reinicialitza el Waydroid Name[ca@valencia]=Reinicialitza Waydroid Name[es]=Reiniciar Waydroid Name[eu]=Berrezarri Waydroid +Name[fi]=Palauta Waydroid Name[fr]=Réinitialiser Waydroid Name[he]=איפוס Waydroid Name[it]=Ripristina Waydroid @@ -145,6 +146,7 @@ Description[ca]=Permet la supressió de la carpeta del Waydroid Description[ca@valencia]=Permet la supressió de la carpeta de Waydroid Description[es]=Permitir el borrado de la carpeta de Waydroid Description[eu]=Baimendu waydroid karpeta ezabatzea +Description[fi]=Salli Waydroid-kansion poistaminen Description[fr]=Autoriser la suppression du dossier « waydroid » Description[he]=לאפשר את מחיקת התיקייה של waydroid Description[it]=Permetti di eliminare la cartella waydroid