Commit ae7a05e1 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 27fa3f7e
......@@ -92,7 +92,7 @@ Comment[fi]=Välilehtipalkki aktiviteettien vaihtamiseen
Comment[fr]=Barre d'onglets permettant de changer d'activité
Comment[fy]=Ljepper om tusken aktiviteiten te wikseljen
Comment[ga]=Barra na gcluaisíní chun an ghníomhaíocht a mhalartú
Comment[gl]=Barra de lapelas para cambiar entre actividades
Comment[gl]=Barra de separadores para cambiar entre actividades
Comment[gu]=ક્રિયાઓ બદલવા માટે ટેબ પટ્ટી
Comment[he]=סרגל לשוניות למעבר בין פעילויות
Comment[hi]=क्रिया स्विच करने के लिए टैबपट्टी
......@@ -20,6 +20,7 @@ Name[nn]=Plasma (utvikling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[pl]=Plazma (Rozwój , 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[ru]=Plasma (разрабатываемая версия, 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})
......@@ -23,6 +23,7 @@ Name[nn]=Plasma (Wayland)
Name[pl]=Plazma (Wayland)
Name[pt]=Plasma (Wayland)
Name[pt_BR]=Plasma (Wayland)
Name[ru]=Plasma (Wayland)
Name[sk]=Plasma (Wayland)
Name[sv]=Plasma (Wayland)
Name[uk]=Плазма (Wayland)
......@@ -21,6 +21,7 @@ Name[nn]=Plasma (utvikling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[pl]=Plazma (Rozwój , 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[ru]=Plasma (разрабатываемая версия, 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})
......@@ -21,6 +21,7 @@ Name[nn]=Nettverk
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