mirror of
https://invent.kde.org/network/krfb
synced 2024-07-03 00:18:36 +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
f0c1bc787e
commit
08d967af66
|
@ -93,6 +93,7 @@ GenericName[nn]=Skrivebordsdeling (VNC)
|
|||
GenericName[pl]=Współdzielenie pulpitu (VNC)
|
||||
GenericName[pt]=Partilha do Ecrã (VNC)
|
||||
GenericName[pt_BR]=Compartilhamento de ambiente de trabalho (VNC)
|
||||
GenericName[sk]=Zdieľanie pracovnej plochy (VNC)
|
||||
GenericName[sl]=Souporaba namizja (VNC)
|
||||
GenericName[sv]=Skrivbordsdelning (VNC)
|
||||
GenericName[uk]=Спільні стільниці (VNC)
|
||||
|
|
Loading…
Reference in New Issue
Block a user