mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 09:50:12 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
cef7ea3be6
commit
2834e581e0
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue