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 2023-08-07 02:39:41 +00:00
parent dc371cd105
commit 0af23ee718
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/plasma-mobile-dev.desktop.cmake
View file

@ -51,7 +51,7 @@ Comment[et]=KDE Plasma Mobile
Comment[eu]=Plasma Mugikorra KDEk egina
Comment[fi]=KDE:n Plasma Mobile
Comment[fr]=Plasma Mobile par KDE
Comment[gl]=Plasma Mobile de KDE
Comment[gl]=Plasma Mobile de KDE.
Comment[hi]=केडीइ द्वारा प्लाज़्मा मोबाइल
Comment[hu]=Plasma Mobile a KDE-től
Comment[ia]=Plasma Mobile per KDE

2
bin/plasma-mobile.desktop.cmake
View file

@ -62,7 +62,7 @@ Comment[et]=KDE Plasma Mobile
Comment[eu]=Plasma Mugikorra KDEk egina
Comment[fi]=KDE:n Plasma Mobile
Comment[fr]=Plasma Mobile par KDE
Comment[gl]=Plasma Mobile de KDE
Comment[gl]=Plasma Mobile de KDE.
Comment[hi]=केडीइ द्वारा प्लाज़्मा मोबाइल
Comment[hu]=Plasma Mobile a KDE-től
Comment[ia]=Plasma Mobile per KDE