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 2026-01-08 01:37:51 +00:00
parent 2b01006730
commit f7f086698b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,7 +89,7 @@ Name[ca@valencia]=Recupera l'ID d'Android per als Google Services
Name[es]=Obtener ID de Android para los servicios de Google
Name[eu]=Lortu Google zerbitzuetarako Android ID
Name[fi]=Nouda Androidin tunniste Google-palveluja varten
Name[fr]=Récupérer l'identifiant Android pour les services de Google
Name[fr]=Retrouver l'identifiant Android pour les services de Google
Name[he]=משיכת מזהה Android לשירותי Google
Name[hu]=Android azonosító lekérése a Google Services-től
Name[is]=Sækja Android-auðkenni fyrir Google þjónustur