wilderjds
/
plasma-workspace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
wilder-5.18
l10n daemon script 7 years ago
parent 532d4da7bf
commit 4e95a96b98
4 changed files with 20 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      login-sessions/plasmawayland-dev.desktop.cmake
  2. 5
      login-sessions/plasmawayland.desktop.cmake
  3. 5
      login-sessions/plasmax11-dev.desktop.cmake
  4. 5
      menu/desktop/kf5-network.directory

5
login-sessions/plasmawayland-dev.desktop.cmake
Unescape View File

@ -2,6 +2,11 @@
Exec=dbus-run-session @CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -wayland Exec=dbus-run-session @CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -wayland
DesktopNames=KDE DesktopNames=KDE
Name=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[lt]=Plasma (Plėtojimas, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})xx
Comment=Plasma by KDE Comment=Plasma by KDE
Comment[ar]=بلازما كدي Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe Comment[bs]=Plazma od strane KDe

5
login-sessions/plasmawayland.desktop.cmake
Unescape View File

@ -3,6 +3,11 @@ Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
DesktopNames=KDE DesktopNames=KDE
Name=Plasma (Wayland) Name=Plasma (Wayland)
Name[ca]=Plasma (Wayland)
Name[lt]=Plasma (Wayland)
Name[pt]=Plasma (Wayland)
Name[uk]=Плазма (Wayland)
Name[x-test]=xxPlasma (Wayland)xx
Comment=Plasma by KDE Comment=Plasma by KDE
Comment[ar]=بلازما كدي Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe Comment[bs]=Plazma od strane KDe

5
login-sessions/plasmax11-dev.desktop.cmake
Unescape View File

@ -3,6 +3,11 @@ Type=XSession
Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -x11 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -x11
DesktopNames=KDE DesktopNames=KDE
Name=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[lt]=Plasma (Plėtojimas, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})xx
Comment=Plasma by KDE Comment=Plasma by KDE
Comment[ar]=بلازما كدي Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe Comment[bs]=Plazma od strane KDe

5
menu/desktop/kf5-network.directory
Unescape View File

@ -1,4 +1,9 @@
[Desktop Entry] [Desktop Entry]
Type=Directory Type=Directory
Name=Network Name=Network
Name[ca]=Xarxa
Name[lt]=Tinklas
Name[pt]=Rede
Name[uk]=Мережа
Name[x-test]=xxNetworkxx
Icon=applications-network Icon=applications-network

Write Preview
Loading…
Cancel
Save