Commit 572000c8 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 11987ccb
...@@ -20,7 +20,7 @@ Name[id]=Gambar-mini 5x4 foto ...@@ -20,7 +20,7 @@ Name[id]=Gambar-mini 5x4 foto
Name[is]=Smámyndir 5x4 myndir Name[is]=Smámyndir 5x4 myndir
Name[it]=Miniature, 5×4 foto Name[it]=Miniature, 5×4 foto
Name[km]=រូប​ថត​របស់​រូបភាព​តូច​ៗ ៥x៤ Name[km]=រូប​ថត​របស់​រូបភាព​តូច​ៗ ៥x៤
Name[ko]=미리 보기 그림 5x4 사진 Name[ko]=축소판 5x4 사진
Name[lv]=Sīktēli 5x4 fotogrāfijas Name[lv]=Sīktēli 5x4 fotogrāfijas
Name[nb]=Miniatyrer 5×4 bilder Name[nb]=Miniatyrer 5×4 bilder
Name[nds]=Vöransichtbiller 5x4 Fotos Name[nds]=Vöransichtbiller 5x4 Fotos
...@@ -20,7 +20,7 @@ Name[id]=Gambar-mini 6x5 foto ...@@ -20,7 +20,7 @@ Name[id]=Gambar-mini 6x5 foto
Name[is]=Smámyndir 6x5 myndir Name[is]=Smámyndir 6x5 myndir
Name[it]=Miniature, 6×5 foto Name[it]=Miniature, 6×5 foto
Name[km]=រូប​ថត​របស់​រូបភាព​តូច​ៗ ៦x៥ Name[km]=រូប​ថត​របស់​រូបភាព​តូច​ៗ ៦x៥
Name[ko]=미리 보기 그림 6x5 사진 Name[ko]=축소판 6x5 사진
Name[lv]=Sīktēli 6x5 fotogrāfijas Name[lv]=Sīktēli 6x5 fotogrāfijas
Name[nb]=Miniatyrer 6×5 bilder Name[nb]=Miniatyrer 6×5 bilder
Name[nds]=Vöransichtbiller 6x5 Fotos Name[nds]=Vöransichtbiller 6x5 Fotos
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment