averello/kdeconnect-kde-mirror
1
0
Fork 0
mirror of https://invent.kde.org/network/kdeconnect-kde.git synced 2025-12-12 20:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

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-12-09 01:34:47 +00:00
parent 19ba1191fd
commit 39b319fff9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kdeconnect.notifyrc
View File

@@ -1040,6 +1040,7 @@ Name[bg]=Грешка в таблета за чертане
Name[ca]=Error de la tauleta de dibuix
Name[ca@valencia]=S'ha produït un error de la tauleta de dibuix
Name[es]=Error de dibujo en la tableta
Name[eu]=Marrazteko tabletaren errorea
Name[fr]=Erreur concernant la tablette graphique
Name[he]=שגיאת לוח ציור
Name[is]=Villa í teiknitöflu
@@ -1059,6 +1060,7 @@ Comment[bg]=Нещо се обърка с приставката за графи
Comment[ca]=Alguna cosa ha anat malament amb el connector de la tauleta de dibuix
Comment[ca@valencia]=Alguna cosa ha anat malament amb el connector de la tauleta de dibuix
Comment[es]=Algo falló en el complemento de dibujo en la tableta
Comment[eu]=Marrazteko tabletaren pluginarekin zerbait gaizki atera da
Comment[fr]=Un problème est survenu avec le module externe pour la tablette graphique
Comment[he]=משהו השתבש בתוסף לוח הציור
Comment[is]=Eitthvað fór úrskeiðis með teiknitöfluviðbótina