Commit 3d38830d 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 a53e8065
......@@ -21,6 +21,7 @@ Name[id]=Tanggapan Pengguna
Name[it]=Segnalazioni dell'utente
Name[lt]=Naudotojo grįžtamasis ryšys
Name[nl]=Terugkoppeling van gebruiker
Name[nn]=Tilbakemeldingar
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários dos usuários
Name[ru]=Обратная связь
......@@ -42,6 +43,7 @@ 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
Comment[nn]=Set opp tilbakemeldingar frå brukarar
Comment[pt]=Configurar as opções das reacções do utilizador
Comment[pt_BR]=Configure as definições dos comentários dos usuários
Comment[ru]=Настройка параметров обратной связи
......
......@@ -10,6 +10,7 @@ Name[id]=Tanggapan
Name[it]=Segnalazioni
Name[lt]=Grįžtamasis ryšys
Name[nl]=Terugkoppeling
Name[nn]=Tilbakemelding
Name[pt]=Reacções
Name[pt_BR]=Comentários
Name[ru]=Обратная связь
......
......@@ -10,9 +10,11 @@ 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})
Name[nn]=Plasma (utvikling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt_BR]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[sk]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})xx
Name[zh_TW]=Plasma (開發版本,Wayland ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -12,9 +12,11 @@ Name[id]=Plasma (Wayland)
Name[it]=Plasma (Wayland)
Name[lt]=Plasma (Wayland)
Name[nl]=Plasma (Wayland)
Name[nn]=Plasma (Wayland)
Name[pt]=Plasma (Wayland)
Name[pt_BR]=Plasma (Wayland)
Name[sk]=Plasma (Wayland)
Name[sv]=Plasma (Wayland)
Name[uk]=Плазма (Wayland)
Name[x-test]=xxPlasma (Wayland)xx
Name[zh_TW]=Plasma (Wayland)
......
......@@ -11,9 +11,11 @@ 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})
Name[nn]=Plasma (utvikling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt_BR]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[sk]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})xx
Name[zh_TW]=Plasma (開發版本,X11 ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -10,9 +10,11 @@ Name[id]=Jaringan
Name[it]=Rete
Name[lt]=Tinklas
Name[nl]=Netwerk
Name[nn]=Nettverk
Name[pt]=Rede
Name[pt_BR]=Rede
Name[sk]=Sieť
Name[sv]=Nätverk
Name[uk]=Мережа
Name[x-test]=xxNetworkxx
Name[zh_TW]=網路
......
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