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-08-27 01:36:18 +00:00
parent 0ed8ead6f3
commit 4a9c591146
2 changed files with 4 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

@ -124,6 +124,7 @@ Name[ca]=Reinicialitza el Waydroid
Name[ca@valencia]=Reinicialitza Waydroid
Name[es]=Reiniciar Waydroid
Name[eu]=Berrezarri Waydroid
Name[fr]=Réinitialiser Waydroid
Name[he]=איפוס Waydroid
Name[it]=Ripristina Waydroid
Name[ka]=Waydroid-ის ჩამოყრა
@ -142,6 +143,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[fr]=Autoriser la suppression du dossier « waydroid »
Description[he]=לאפשר את מחיקת התיקייה של waydroid
Description[it]=Permetti di eliminare la cartella waydroid
Description[ka]=Waydroid-ის საქაღალდის წაშლის დაშვება

2
quicksettings/flashlight/kauth/flashlighthelper.actions
View file

@ -32,6 +32,7 @@ Name[ca]=Estableix la lluminositat del llum de flaix
Name[ca@valencia]=Establix la brillantor del llum de flaix
Name[es]=Ajustar el brillo de la linterna
Name[eu]=Ezarri esku-argiaren distira
Name[fr]=Régler la luminosité de la lampe de poche
Name[he]=הגדרת בהירות פנס
Name[it]=Imposta la luminosità della torcia
Name[ka]=განათების სიკაშკაშის დაყენება
@ -50,6 +51,7 @@ Description[ca]=Permet establir la lluminositat del dispositiu LED
Description[ca@valencia]=Permet establir la lluminositat del dispositiu LED
Description[es]=Permitir ajustar el brillo del led del dispositivo
Description[eu]=LED-gailuaren distira ezartzeko aukera eskaintzen du
Description[fr]=Autoriser la définition de la luminosité sur le périphérique à LED
Description[he]=לאפשר להגדיר בהירות על התקן נורית
Description[it]=Consenti di impostare la luminosità sul dispositivo LED
Description[ka]=LED მოწყობილობებზე სიკაშკაშის დაყენების დაშვება