mirror of
https://invent.kde.org/utilities/filelight
synced 2024-07-01 06:54:25 +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
176a18047f
commit
f683346120
|
@ -159,7 +159,7 @@ Comment[mr]=डिस्क वापर माहिती बघा
|
|||
Comment[nb]=Vis informasjon om bruk av diskplass
|
||||
Comment[nds]=Wiest Informatschonen över den Bruuk vun de Fastplaat
|
||||
Comment[nl]=Informatie over schijfgebruik bekijken
|
||||
Comment[nn]=Vis informasjon om diskbruk
|
||||
Comment[nn]=Visualiser informasjon om diskbruk
|
||||
Comment[pa]=ਡਿਸਕ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ
|
||||
Comment[pl]=Zobacz informacje o wykorzystaniu dysku
|
||||
Comment[pt]=Ver a informação de utilização do disco
|
||||
|
|
Loading…
Reference in New Issue
Block a user