Commit 23a5d0ce 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 c9c0f070
......@@ -6,6 +6,7 @@ Name[ast]=Plasma (Desendolcu, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[gl]=Plasma (desenvolvemento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[lt]=Plasma (Plėtojimas, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -8,6 +8,7 @@ Name[ca]=Plasma (Wayland)
Name[cs]=Plasma (Wayland)
Name[es]=Plasma (Wayland)
Name[gl]=Plasma (Wayland)
Name[it]=Plasma (Wayland)
Name[lt]=Plasma (Wayland)
Name[nl]=Plasma (Wayland)
Name[pt]=Plasma (Wayland)
......
......@@ -7,6 +7,7 @@ Name[ast]=Plasma (Desendolcu, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[gl]=Plasma (desenvolvemento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[lt]=Plasma (Plėtojimas, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -6,6 +6,7 @@ Name[ca]=Xarxa
Name[cs]=Síť
Name[es]=Red
Name[gl]=Rede
Name[it]=Rete
Name[lt]=Tinklas
Name[nl]=Netwerk
Name[pt]=Rede
......
[Desktop Entry]
Name=Recent Documents
Name[ar]=المستندات الأخيرة
Name[ast]=Documentos de recién
Name[ast]=Documentos d'apocayá
Name[be]=Нядаўнія дакументы
Name[be@latin]=Niadaŭnyja dakumenty
Name[bg]=Последно използвани
......
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