Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit eb32234d 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 fdfa2705
......@@ -17,6 +17,7 @@ Name[gl]=Cámara
Name[ia]=Camera
Name[it]=Camera
Name[ko]=카메라
Name[lt]=Kamera
Name[nl]=Camera
Name[nn]=Kamera
Name[pl]=Aparat
......@@ -42,6 +43,7 @@ GenericName[gl]=Fotos móbiles
GenericName[ia]=Photos de Mobile
GenericName[it]=Foto per mobile
GenericName[ko]=모바일 사진
GenericName[lt]=Mobiliosios nuotraukos
GenericName[nl]=Foto's op mobiel
GenericName[nn]=Mobilfoto
GenericName[pl]=Przenośne zdjęcia
......
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