marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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 2025-09-13 01:41:43 +00:00
parent 674c5034ae
commit d5df7336e1
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/waydroidintegrationplugin/kauth/waydroidhelper.actions
View file

@ -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