kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-16 02:07:13 +00:00
Code Issues Actions Packages Projects Releases 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 2020-03-02 05:36:51 +01:00
parent 7a2885853a
commit b10a84c770
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphinpart.desktop
View file

@ -137,7 +137,7 @@ Name[ja]=コンパクト
Name[ko]=축소됨 Name[ko]=축소됨
Name[lt]=Kompaktiškas Name[lt]=Kompaktiškas
Name[lv]=Kompakts Name[lv]=Kompakts
Name[ml]=തിങ്ങിയതായി Name[ml]=തിങ്ങിയത്
Name[nb]=Kompakt Name[nb]=Kompakt
Name[nl]=Compact Name[nl]=Compact
Name[nn]=Kompakt Name[nn]=Kompakt

2
src/settings/kcm/kcmdolphingeneral.desktop
View file

@ -217,7 +217,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[ko]=파일 관리자
X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[lv]=datņu pārvaldnieks X-KDE-Keywords[lv]=datņu pārvaldnieks
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nl]=bestandsbeheerder
X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[nn]=filhandsamar

2
src/settings/kcm/kcmdolphinnavigation.desktop
View file

@ -218,7 +218,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[ko]=파일 관리자
X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[lv]=datņu pārvaldnieks X-KDE-Keywords[lv]=datņu pārvaldnieks
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nl]=bestandsbeheerder
X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[nn]=filhandsamar

2
src/settings/kcm/kcmdolphinservices.desktop
View file

@ -170,7 +170,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[ko]=파일 관리자
X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[lv]=datņu pārvaldnieks X-KDE-Keywords[lv]=datņu pārvaldnieks
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nl]=bestandsbeheerder
X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[nn]=filhandsamar

4
src/settings/kcm/kcmdolphinviewmodes.desktop
View file

@ -170,7 +170,7 @@ Comment[ja]=ファイルマネージャの表示モードを設定します
Comment[ko]=파일 관리자 보기 모드 구성 Comment[ko]=파일 관리자 보기 모드 구성
Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas
Comment[lv]=Konfigurēt datņu pārvaldnieka skata režīmus Comment[lv]=Konfigurēt datņu pārvaldnieka skata režīmus
Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ രീതികള്‍ ക്രമീകരിയ്ക്കുക
Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nb]=Tilpass filbehandlerens visningsmåter
Comment[nl]=Bestandsbeheerderweergavemodussen configureren Comment[nl]=Bestandsbeheerderweergavemodussen configureren
Comment[nn]=Set opp visingsmodusane i filhandsamaren Comment[nn]=Set opp visingsmodusane i filhandsamaren
@ -217,7 +217,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[ko]=파일 관리자
X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[lv]=datņu pārvaldnieks X-KDE-Keywords[lv]=datņu pārvaldnieks
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nl]=bestandsbeheerder
X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[nn]=filhandsamar