kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-15 18:01:11 +00:00
Code Issues Actions 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 2022-05-01 03:11:08 +00:00
parent cef7ea3be6
commit 2834e581e0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/kcm/kcmdolphinviewmodes.desktop
View file

@ -147,7 +147,7 @@ Name[pa]=ਵੇਖਣ ਢੰਗ
Name[pl]=Tryby widoku
Name[pt]=Modos de Visualização
Name[pt_BR]=Modos de exibição
Name[ro]=Moduri de vizualizare
Name[ro]=Regimuri de vizualizare
Name[ru]=Режимы просмотра
Name[se]=Čájehanmodusat
Name[sk]=Režimy zobrazenia