kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +03:00
Code Issues 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"
This commit is contained in:
l10n daemon script 2020-07-28 10:14:12 +02:00
parent 5fce1a5266
commit ce365f35ad
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lattedock.notifyrc
View File

@ -1,7 +1,7 @@
[Global]
Name=Latte Dock
Name[ar]=رصيف لاتيه
Name[ca]=Latte Dock
Name[ca]=Acoblador Latte
Name[ca@valencia]=Latte Dock
Name[cs]=Dok Latte
Name[da]=Latte-dok
@ -30,7 +30,7 @@ Name[zh_CN]=Latte 停靠栏
Name[zh_TW]=Latte Dock
Comment=Latte Dock
Comment[ar]=رصيف لاتيه
Comment[ca]=Acoblador del Latte
Comment[ca]=Acoblador Latte
Comment[ca@valencia]=Acoblador del Latte
Comment[cs]=Dok Latte
Comment[da]=Latte-dok

2
containment/metadata.desktop.cmake
View File

@ -30,7 +30,7 @@ Name[x-test]=xxLattexx
Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Containment provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[da]=Beholder til Latte-dokken
Comment[de]=Containment für Latte-Dock

2
containment/package/metadata.desktop
View File

@ -30,7 +30,7 @@ Name[x-test]=xxLattexx
Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Containment provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[da]=Beholder til Latte-dokken
Comment[de]=Containment für Latte-Dock

2
plasmoid/metadata.desktop.cmake
View File

@ -25,7 +25,7 @@ Name[x-test]=xxLatte Tasksxx
Name[zh_CN]=Latte 任务管理器
Name[zh_TW]=Latte 工作
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
Comment[ca]=Plasmoide de tasques de l'acoblador Latte
Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
Comment[cs]=Plasmoid úloh z doku Latte
Comment[en_GB]=Tasks plasmoid from Latte Dock

2
plasmoid/package/metadata.desktop
View File

@ -25,7 +25,7 @@ Name[x-test]=xxLatte Tasksxx
Name[zh_CN]=Latte 任务管理器
Name[zh_TW]=Latte 工作
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
Comment[ca]=Plasmoide de tasques de l'acoblador Latte
Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
Comment[cs]=Plasmoid úloh z doku Latte
Comment[en_GB]=Tasks plasmoid from Latte Dock

2
shell/metadata.desktop.cmake
View File

@ -29,7 +29,7 @@ Name[x-test]=xxLatte Shellxx
Name[zh_CN]=Latte Shell
Name[zh_TW]=Latte Shell
Comment=Shell provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[da]=Skal til Latte-dokken
Comment[de]=Shell für Latte-Dock

2
shell/package/metadata.desktop
View File

@ -29,7 +29,7 @@ Name[x-test]=xxLatte Shellxx
Name[zh_CN]=Latte Shell
Name[zh_TW]=Latte Shell
Comment=Shell provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
Comment[da]=Skal til Latte-dokken
Comment[de]=Shell für Latte-Dock