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 2fa0b0e4 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 0faaa0b6
......@@ -10,6 +10,7 @@ Name[de]=Kamera
Name[el]=Κάμερα
Name[en_GB]=Camera
Name[es]=Cámara
Name[et]=Kaamera
Name[fi]=Kamera
Name[fr]=Appareil photo
Name[gl]=Cámara
......@@ -33,6 +34,7 @@ GenericName[cs]=Mobilní fotografie
GenericName[el]=Φωτογραφίες από κινητό
GenericName[en_GB]=Mobile Photos
GenericName[es]=Fotos del móvil
GenericName[et]=Mobiili fotod
GenericName[fi]=Mobiilikuvat
GenericName[fr]=Photos mobiles
GenericName[gl]=Fotos móbiles
......
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