Commit 34ccaa4f 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 e78b3c9f
...@@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=personalization ...@@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=personalization
Name=User Feedback Name=User Feedback
Name[ca]=Comentaris de l'usuari Name[ca]=Comentaris de l'usuari
Name[cs]=Zpětná vazba uživatele Name[cs]=Zpětná vazba uživatele
Name[da]=Brugerfeedback
Name[en_GB]=User Feedback Name[en_GB]=User Feedback
Name[es]=Comentarios del usuario Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside Name[et]=Kasutaja tagasiside
...@@ -41,6 +42,7 @@ Name[zh_TW]=使用者意見回應 ...@@ -41,6 +42,7 @@ Name[zh_TW]=使用者意見回應
Comment=Configure user feedback settings Comment=Configure user feedback settings
Comment[ca]=Configura els ajustaments dels comentaris de l'usuari Comment[ca]=Configura els ajustaments dels comentaris de l'usuari
Comment[cs]=Nastavení voleb uživatelské zpětné vazby Comment[cs]=Nastavení voleb uživatelské zpětné vazby
Comment[da]=Indstillinger for brugerfeedback
Comment[en_GB]=Configure user feedback settings Comment[en_GB]=Configure user feedback settings
Comment[es]=Configurar las preferencias de los comentarios del usuario Comment[es]=Configurar las preferencias de los comentarios del usuario
Comment[et]=Kasutaja tagasiside seadistamine Comment[et]=Kasutaja tagasiside seadistamine
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=Feedback Name=Feedback
Name[ca]=Comentaris Name[ca]=Comentaris
Name[cs]=Zpětná vazba Name[cs]=Zpětná vazba
Name[da]=Feedback
Name[de]=Rückmeldung Name[de]=Rückmeldung
Name[en_GB]=Feedback Name[en_GB]=Feedback
Name[es]=Comentarios Name[es]=Comentarios
......
...@@ -4,6 +4,7 @@ DesktopNames=KDE ...@@ -4,6 +4,7 @@ DesktopNames=KDE
Name=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[ast]=Plasma (Desendolcu, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[ast]=Plasma (Desendolcu, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[ca]=Plasma (Desenvolupament, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[da]=Plasma (udvikling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[de]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[de]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[en_GB]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[en_GB]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
......
...@@ -6,6 +6,7 @@ Name=Plasma (Wayland) ...@@ -6,6 +6,7 @@ Name=Plasma (Wayland)
Name[ast]=Plasma (Wayland) Name[ast]=Plasma (Wayland)
Name[ca]=Plasma (Wayland) Name[ca]=Plasma (Wayland)
Name[cs]=Plasma (Wayland) Name[cs]=Plasma (Wayland)
Name[da]=Plasma (Wayland)
Name[de]=Plasma (Wayland) Name[de]=Plasma (Wayland)
Name[en_GB]=Plasma (Wayland) Name[en_GB]=Plasma (Wayland)
Name[es]=Plasma (Wayland) Name[es]=Plasma (Wayland)
......
...@@ -5,6 +5,7 @@ DesktopNames=KDE ...@@ -5,6 +5,7 @@ DesktopNames=KDE
Name=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[ast]=Plasma (Desendolcu, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[ast]=Plasma (Desendolcu, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[ca]=Plasma (Desenvolupament, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[da]=Plasma (udvikling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[de]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[de]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[en_GB]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[en_GB]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
......
...@@ -4,6 +4,7 @@ Name=Network ...@@ -4,6 +4,7 @@ Name=Network
Name[ast]=Rede Name[ast]=Rede
Name[ca]=Xarxa Name[ca]=Xarxa
Name[cs]=Síť Name[cs]=Síť
Name[da]=Netværk
Name[de]=Netzwerk Name[de]=Netzwerk
Name[en_GB]=Network Name[en_GB]=Network
Name[es]=Red Name[es]=Red
......
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