kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages 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 2016-03-21 10:58:51 +00:00
parent 496a2cce6b
commit 32db592309
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dolphinpart.desktop
View file

@ -87,10 +87,10 @@ Name[ru]=Значки
Name[se]=Govažat Name[se]=Govažat
Name[sk]=Ikony Name[sk]=Ikony
Name[sl]=Ikone Name[sl]=Ikone
Name[sr]=Иконе Name[sr]=Иконице
Name[sr@ijekavian]=Иконе Name[sr@ijekavian]=Иконице
Name[sr@ijekavianlatin]=Ikone Name[sr@ijekavianlatin]=Ikonice
Name[sr@latin]=Ikone Name[sr@latin]=Ikonice
Name[sv]=Ikoner Name[sv]=Ikoner
Name[tr]=Simgeler Name[tr]=Simgeler
Name[uk]=Піктограми Name[uk]=Піктограми