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 2019-12-31 05:45:46 +01:00
parent ab190aa5da
commit 6fd1d0184e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ Name[fr]=Plasma Mobile
Name[gl]=Plasma Mobile Name[gl]=Plasma Mobile
Name[hu]=Plasma Mobile Name[hu]=Plasma Mobile
Name[ia]=Plasma Mobile Name[ia]=Plasma Mobile
Name[id]=Seluler Plasma Name[id]=Plasma Mobile
Name[it]=Plasma Mobile Name[it]=Plasma Mobile
Name[ko]=Plasma 모바일 Name[ko]=Plasma 모바일
Name[lt]=Plasma mobilioji sąsaja Name[lt]=Plasma mobilioji sąsaja
@ -44,7 +44,7 @@ Comment[fr]=Plasma Mobile par KDE
Comment[gl]=Plasma Mobile de KDE Comment[gl]=Plasma Mobile de KDE
Comment[hu]=Plasma Mobile a KDE-től Comment[hu]=Plasma Mobile a KDE-től
Comment[ia]=Plasma Mobile per KDE Comment[ia]=Plasma Mobile per KDE
Comment[id]=Seluler Plasma oleh KDE Comment[id]=Plasma Mobile oleh KDE
Comment[it]=Plasma Mobile creato da KDE Comment[it]=Plasma Mobile creato da KDE
Comment[ko]=KDE의 Plasma 모바일 Comment[ko]=KDE의 Plasma 모바일
Comment[lt]=Plasma mobilioji sąsaja pagal KDE Comment[lt]=Plasma mobilioji sąsaja pagal KDE