Commit af2638fb authored by Script Kiddy's avatar Script Kiddy

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 0ab9566f
...@@ -29,6 +29,7 @@ Name[sk]=Fotoaparát ...@@ -29,6 +29,7 @@ Name[sk]=Fotoaparát
Name[sl]=Camera Name[sl]=Camera
Name[sv]=Kamera Name[sv]=Kamera
Name[uk]=Фотоапарат Name[uk]=Фотоапарат
Name[zh_TW]=相機 Name[zh_TW]=相機
GenericName=Mobile Photos GenericName=Mobile Photos
GenericName[ca]=Fotos del mòbil GenericName[ca]=Fotos del mòbil
...@@ -56,6 +57,7 @@ GenericName[sk]=Mobilné fotky ...@@ -56,6 +57,7 @@ GenericName[sk]=Mobilné fotky
GenericName[sl]=Mobilne fotografije GenericName[sl]=Mobilne fotografije
GenericName[sv]=Mobilfoton GenericName[sv]=Mobilfoton
GenericName[uk]=Фотографії з телефону GenericName[uk]=Фотографії з телефону
GenericName[x-test]=xxMobile Photosxx
GenericName[zh_TW]=行動照片 GenericName[zh_TW]=行動照片
Type=Application Type=Application
Icon=camera-photo Icon=camera-photo
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