Commit bd3ea5c0 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 4656d3fa
......@@ -59,6 +59,7 @@ Name[ca]=Executa una ordre al contingut del porta-retalls
Name[ca@valencia]=Executa una ordre al contingut del porta-retalls
Name[es]=Ejecutar orden sobre el contenido del portapapeles
Name[eu]=Exekutatu komandoa arbelaren edukiaren gain
Name[fr]=Exécuter la commande en utilisant le contenu du presse-papier
Name[id]=Jalankan perintah pada konten-konten papan-klip
Name[it]=Esegui comando sui contenuti degli appunti
Name[ko]=클립보드 내용에서 명령 실행하기
......
......@@ -5,6 +5,7 @@ Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -6,6 +6,7 @@ Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
......
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