mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +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
32db592309
commit
0c90433478
|
@ -21,6 +21,7 @@ Name[lt]=Dolphin rodymo būdai
|
|||
Name[nb]=Dolphin visningsmåter
|
||||
Name[nl]=Dolphin-weergavemodussen
|
||||
Name[nn]=Dolphin-visingar
|
||||
Name[pa]=ਡਾਲਫਿਨ ਝਲਕ ਢੰਗ
|
||||
Name[pl]=Tryby widoku Dolphina
|
||||
Name[pt]=Modos de Visualização do Dolphin
|
||||
Name[pt_BR]=Modos de exibição do Dolphin
|
||||
|
|
Loading…
Reference in a new issue