Commit 9eb9a97c 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 bef9f3f0
......@@ -18,6 +18,7 @@ Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
Name[eu]=Erabiltzaileen berrelikadura
Name[fi]=Käyttäjäpalaute
Name[fr]=Retours des utilisateurs
Name[gl]=Achegas de usuario
Name[hu]=Felhasználói visszajelzés
Name[id]=Tanggapan Pengguna
......@@ -44,6 +45,7 @@ Comment[es]=Configurar las preferencias de los comentarios del usuario
Comment[et]=Kasutaja tagasiside seadistamine
Comment[eu]=Konfiguratu erabiltzaileen berrelikadura ezarpenak
Comment[fi]=Käyttäjäpalautteen asetukset
Comment[fr]=Configurer les paramètres des retours des utilisateurs
Comment[gl]=Configurar as achegas de usuario
Comment[hu]=A felhasználói visszajelzések beállításai
Comment[id]=Konfigurasikan pengaturan tanggapan pengguna
......
......@@ -8,6 +8,7 @@ Name[es]=Comentarios
Name[et]=Tagasiside
Name[eu]=Berrelikadura
Name[fi]=Palaute
Name[fr]=Retours
Name[gl]=Achegas
Name[hu]=Visszajelzés
Name[id]=Tanggapan
......
......@@ -9,6 +9,7 @@ Name[en_GB]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[et]=Plasma (arendus, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[gl]=Plasma (desenvolvemento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[hu]=Plasma (Fejlesztői verzió, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[id]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -11,6 +11,7 @@ Name[en_GB]=Plasma (Wayland)
Name[es]=Plasma (Wayland)
Name[et]=Plasma (Wayland)
Name[eu]=Plasma (Wayland)
Name[fr]=Plasma (Wayland)
Name[gl]=Plasma (Wayland)
Name[hu]=Plasma (Wayland)
Name[id]=Plasma (Wayland)
......
......@@ -10,6 +10,7 @@ Name[en_GB]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[et]=Plasma (arendus, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[gl]=Plasma (desenvolvemento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[hu]=Plasma (Fejlesztői verzió, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[id]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -9,6 +9,7 @@ Name[en_GB]=Network
Name[es]=Red
Name[et]=Võrk
Name[eu]=Sarea
Name[fr]=Réseau
Name[gl]=Rede
Name[hu]=Hálózat
Name[id]=Jaringan
......
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