Commit 6c9a718a 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 9b857cce
......@@ -17,6 +17,7 @@ Name[en_GB]=User Feedback
Name[es]=Comentarios del usuario
Name[fi]=Käyttäjäpalaute
Name[gl]=Achegas de usuario
Name[id]=Tanggapan Pengguna
Name[it]=Segnalazioni dell'utente
Name[lt]=Naudotojo grįžtamasis ryšys
Name[nl]=Terugkoppeling van gebruiker
......@@ -36,6 +37,7 @@ Comment[en_GB]=Configure user feedback settings
Comment[es]=Configurar las preferencias de los comentarios del usuario
Comment[fi]=Käyttäjäpalautteen asetukset
Comment[gl]=Configurar as achegas de usuario
Comment[id]=Konfigurasikan pengaturan tanggapan pengguna
Comment[it]=Configura le impostazioni di segnalazione dell'utente
Comment[lt]=Konfigūruoti naudotojo grįžtamojo ryšio nuostatas
Comment[nl]=Instellingen voor terugkoppeling van gebruikers configureren
......
......@@ -6,6 +6,7 @@ Name[en_GB]=Feedback
Name[es]=Comentarios
Name[fi]=Palaute
Name[gl]=Achegas
Name[id]=Tanggapan
Name[it]=Segnalazioni
Name[lt]=Grįžtamasis ryšys
Name[nl]=Terugkoppeling
......
......@@ -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[id]=Plasma (Development, 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})
......
......@@ -8,6 +8,7 @@ Name[ca]=Plasma (Wayland)
Name[cs]=Plasma (Wayland)
Name[es]=Plasma (Wayland)
Name[gl]=Plasma (Wayland)
Name[id]=Plasma (Wayland)
Name[it]=Plasma (Wayland)
Name[lt]=Plasma (Wayland)
Name[nl]=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[id]=Plasma (Development, 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})
......
......@@ -6,6 +6,7 @@ Name[ca]=Xarxa
Name[cs]=Síť
Name[es]=Red
Name[gl]=Rede
Name[id]=Jaringan
Name[it]=Rete
Name[lt]=Tinklas
Name[nl]=Netwerk
......
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