mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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"
This commit is contained in:
parent
fefcec06c6
commit
0c8cd94fe8
6 changed files with 10 additions and 3 deletions
|
|
@ -3,6 +3,7 @@ Encoding=UTF-8
|
|||
Name=Search And Run
|
||||
Name[ast]=Busca y execución
|
||||
Name[ca]=Cerca i executa
|
||||
Name[ca@valencia]=Cerca i executa
|
||||
Name[cs]=Vyhledat a spustit
|
||||
Name[da]=Søg og kør
|
||||
Name[de]=Suchen und Ausführen
|
||||
|
|
@ -37,6 +38,7 @@ Name[zh_TW]=搜尋並執行
|
|||
Comment=Search and run Applications and services
|
||||
Comment[ast]=Busca y executa aplicaciones y servicios
|
||||
Comment[ca]=Cerca i executa aplicacions i serveis
|
||||
Comment[ca@valencia]=Cerca i executa aplicacions i serveis
|
||||
Comment[cs]=Vyhledat a spustit aplikace a služby
|
||||
Comment[da]=Søg og kør programmer og tjenester
|
||||
Comment[de]=Anwendungen und Dienste suchen und ausführen
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ DesktopNames=KDE
|
|||
Name=Plasma Mobile
|
||||
Name[ast]=Plasma Mobile
|
||||
Name[ca]=Plasma Mobile
|
||||
Name[ca@valencia]=Plasma Mòbil
|
||||
Name[ca@valencia]=Plasma Mobile
|
||||
Name[cs]=Plasma Mobile
|
||||
Name[da]=Plasma Mobile
|
||||
Name[de]=Plasma Mobile
|
||||
|
|
@ -40,7 +40,7 @@ Name[zh_TW]=Plasma 行動
|
|||
Comment=Plasma Mobile by KDE
|
||||
Comment[ast]=Plasma Mobile, por KDE
|
||||
Comment[ca]=Plasma Mobile, creat per la comunitat KDE
|
||||
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
|
||||
Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE
|
||||
Comment[cs]=Plasma Mobile od KDE
|
||||
Comment[da]=Plasma Mobile fra KDE
|
||||
Comment[de]=Plasma Mobile von KDE
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ Name[zh_TW]=Plasma 電話
|
|||
Comment=Plasma workspace for smartphones
|
||||
Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes
|
||||
Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents
|
||||
Comment[ca@valencia]=Espai de treball del plasma per a telèfons intel·ligents
|
||||
Comment[ca@valencia]=Espai de treball del Plasma per a telèfons intel·ligents
|
||||
Comment[da]=Plasma arbejdsområde til smartphones
|
||||
Comment[de]=Plasma-Arbeitsbereich für Smartphones
|
||||
Comment[en_GB]=Plasma workspace for smartphones
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ IconName=preferences-system-windows-effect-screenshot
|
|||
Name=Plasma
|
||||
Name[ast]=Plasma
|
||||
Name[ca]=Plasma
|
||||
Name[ca@valencia]=Plasma
|
||||
Name[cs]=Plasma
|
||||
Name[de]=Plasma
|
||||
Name[en_GB]=Plasma
|
||||
|
|
@ -31,6 +32,7 @@ Name[zh_CN]=Plasma
|
|||
[Event/captured]
|
||||
Name=Captured
|
||||
Name[ca]=Capturat
|
||||
Name[ca@valencia]=Capturat
|
||||
Name[cs]=Zachyceno
|
||||
Name[de]=Aufgenommen
|
||||
Name[en_GB]=Captured
|
||||
|
|
@ -56,6 +58,7 @@ Name[x-test]=xxCapturedxx
|
|||
Name[zh_CN]=已捕获
|
||||
Comment=Captured
|
||||
Comment[ca]=Capturat
|
||||
Comment[ca@valencia]=Capturat
|
||||
Comment[cs]=Zachyceno
|
||||
Comment[de]=Aufgenommen
|
||||
Comment[en_GB]=Captured
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=Airplane Mode
|
||||
Name[ca]=Mode avió
|
||||
Name[ca@valencia]=Mode avió
|
||||
Name[cs]=Režim v Letadle
|
||||
Name[en_GB]=Airplane Mode
|
||||
Name[es]=Modo avión
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=Night Color
|
||||
Name[ca]=Color de nit
|
||||
Name[ca@valencia]=Color de nit
|
||||
Name[cs]=Noční barva
|
||||
Name[en_GB]=Night Colour
|
||||
Name[es]=Color nocturno
|
||||
|
|
|
|||
Loading…
Reference in a new issue