Commit 5ad4d23b 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 595ab88b
......@@ -10,7 +10,7 @@ Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[fi]=Plasma (kehitys ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
Name[gl]=Plasma (${CMAKE_INSTALL_FULL_BINDIR} de desenvolvemento)
Name[gl]=Plasma (desenvolvemento ${CMAKE_INSTALL_FULL_BINDIR})
Name[id]=Plasma (Pengembangan${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
Name[lt]=Plasma (Plėtojimas ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -11,7 +11,7 @@ Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[fi]=Plasma (kehitys ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
Name[gl]=Plasma (${CMAKE_INSTALL_FULL_BINDIR} de desenvolvemento)
Name[gl]=Plasma (desenvolvemento ${CMAKE_INSTALL_FULL_BINDIR})
Name[id]=Plasma (Pengembangan${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
Name[lt]=Plasma (Plėtojimas ${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