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-15 01:40:05 +00:00
parent f6b6c51921
commit 868c6a72b6
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ Name[es]=Obtener ID de Android para los servicios de Google
Name[eu]=Lortu Google zerbitzuetarako Android ID
Name[fr]=Récupérer l'identifiant Android pour les services de Google
Name[he]=משיכת מזהה Android לשירותי Google
Name[it]=Recupera l'ID Android per i servizi Google
Name[ka]=Android ID-ის მიღება Google-ის სერვისებისთვის
Name[ko]=Google 서비스에 필요한 안드로이드 ID 가져오기
Name[nl]=Haal Android-ID op voor Google Services
@ -96,6 +97,7 @@ Description[es]=Permitir la obtención del ID de Android del contenedor Waydroid
Description[eu]=Google zerbitzuak aktibatzeko Waydroid edukiontziaren Android ID lortzeko aukera ematen du
Description[fr]=Autoriser l'obtention de l'identifiant Android du conteneur de Waydroid afin d'activer les services de Google
Description[he]=לאפשר משיכת מזהה Android של מכולת Waydroid כדי להפעיל שירותי Google
Description[it]=Permetti di ottenere l'ID Android del contenitore Waydroid per attivare i servizi Google
Description[ka]=Android ID-ის ან Waydroid-ის კონტეინერის მიღების დაშვება Google-ის სერვისების გასააქტიურებლად
Description[ko]=Google 서비스를 활성화하기 위하여 Waydroid 컨테이너의 안드로이드 ID 가져오기 허용
Description[nl]=Sta ophalen van Android-ID van Waydroid-container toe om Google services te activeren
@ -135,6 +137,7 @@ 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[he]=לאפשר את מחיקת התיקייה של waydroid
Description[it]=Permetti di eliminare la cartella waydroid
Description[ka]=Waydroid-ის საქაღალდის წაშლის დაშვება
Description[nl]=Toestaan Waydroid-map te verwijderen
Description[pt_BR]=Permite excluir a pasta do Waydroid