1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-26 18:03:42 +03: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:
l10n daemon script 2019-10-02 09:06:26 +02:00
parent 27aea9b4f6
commit 12ec3bf36c
10 changed files with 17 additions and 0 deletions

View File

@ -2,6 +2,7 @@
Name=Latte Indicators
Name[ca]=Indicadors del Latte
Name[ca@valencia]=Indicadors del Latte
Name[cs]=Ukazatele Latte
Name[en_GB]=Latte Indicators
Name[es]=Indicadores de Latte
Name[fi]=Latte-ilmaisimet

View File

@ -61,6 +61,7 @@ IconName=latte-dock
Name=Imported successfully
Name[ca]=S'ha importat amb èxit
Name[ca@valencia]=S'ha importat amb èxit
Name[cs]=Importováno úspěšně
Name[de]=Erfolgreich importiert
Name[en_GB]=Imported successfully
Name[es]=Importada exitosamente
@ -87,6 +88,7 @@ Action=Popup
Name=Failed to import
Name[ca]=Ha fallat en importar
Name[ca@valencia]=Ha fallat en importar
Name[cs]=Nepodařilo se importovat
Name[de]=Importieren fehlgeschlagen
Name[en_GB]=Failed to import
Name[es]=Error al importar
@ -113,6 +115,7 @@ Action=Popup
Name=Exported successfully
Name[ca]=S'ha exportat amb èxit
Name[ca@valencia]=S'ha exportat amb èxit
Name[cs]=Exportováno úspěšně
Name[de]=Erfolgreich exportiert
Name[en_GB]=Exported successfully
Name[es]=Exportada exitosamente
@ -139,6 +142,7 @@ Action=Popup
Name=Failed to export
Name[ca]=Ha fallat en exportar
Name[ca@valencia]=Ha fallat en exportar
Name[cs]=Export selhal
Name[de]=Exportieren fehlgeschlagen
Name[en_GB]=Failed to export
Name[es]=Error al exportar
@ -165,6 +169,7 @@ Action=Popup
Name=Removed successfully
Name[ca]=S'ha eliminat amb èxit
Name[ca@valencia]=S'ha eliminat amb èxit
Name[cs]=Úspěšně odstraněno
Name[de]=Erfolgreich entfernt
Name[en_GB]=Removed successfully
Name[es]=Eliminada exitosamente
@ -191,6 +196,7 @@ Action=Popup
Name=Failed to remove
Name[ca]=Ha fallat en eliminar
Name[ca@valencia]=Ha fallat en eliminar
Name[cs]=Selhalo odstranění
Name[de]=Entfernen fehlgeschlagen
Name[en_GB]=Failed to remove
Name[es]=Error al eliminar

View File

@ -5,6 +5,7 @@ X-KDE-ServiceType=Latte/Indicator
Comment=Latte indicator
Comment[ca]=Indicador del Latte
Comment[ca@valencia]=Indicador del Latte
Comment[cs]=Ukazatel Latte
Comment[en_GB]=Latte indicator
Comment[es]=Indicador Latte
Comment[fi]=Latte-ilmaisin

View File

@ -2,6 +2,7 @@
Name=Indicator
Name[ca]=Indicador
Name[ca@valencia]=Indicador
Name[cs]=Ukazatel
Name[en_GB]=Indicator
Name[es]=Indicador
Name[fi]=Ilmaisin

View File

@ -30,6 +30,7 @@ Name[zh_TW]=Latte
Comment=Latte default indicator
Comment[ca]=Indicador predeterminat del Latte
Comment[ca@valencia]=Indicador predeterminat del Latte
Comment[cs]=Výchozí ukazatel Latte
Comment[en_GB]=Latte default indicator
Comment[es]=Indicador por omisión de Latte
Comment[fi]=Latte-oletusilmaisin

View File

@ -27,6 +27,7 @@ Name[zh_TW]=Plasma
Comment=Latte Plasma style indicator
Comment[ca]=Indicador a l'estil Plasma del Latte
Comment[ca@valencia]=Indicador a l'estil Plasma del Latte
Comment[cs]=Ukazatel Latte ve stylu Plasma
Comment[en_GB]=Latte Plasma style indicator
Comment[es]=Estilo del indicador Plasma Latte
Comment[fi]=Plasma-tyylin Latte-ilmaisin

View File

@ -2,6 +2,7 @@
Name=Latte Tasks
Name[ca]=Tasques del Latte
Name[ca@valencia]=Tasques del Latte
Name[cs]=Úlohy Latte
Name[en_GB]=Latte Tasks
Name[es]=Tareas de Latte
Name[fi]=Latte-tehtävät
@ -24,6 +25,7 @@ Name[zh_TW]=Latte 任務
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
Comment[cs]=Plasmoid úloh z doku Latte
Comment[en_GB]=Tasks plasmoid from Latte Dock
Comment[es]=Plasmoide de tareas de Latte Dock
Comment[fi]=Latte-telakan tehtäväsovelma

View File

@ -2,6 +2,7 @@
Name=Latte Tasks
Name[ca]=Tasques del Latte
Name[ca@valencia]=Tasques del Latte
Name[cs]=Úlohy Latte
Name[en_GB]=Latte Tasks
Name[es]=Tareas de Latte
Name[fi]=Latte-tehtävät
@ -24,6 +25,7 @@ Name[zh_TW]=Latte 任務
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
Comment[cs]=Plasmoid úloh z doku Latte
Comment[en_GB]=Tasks plasmoid from Latte Dock
Comment[es]=Plasmoide de tareas de Latte Dock
Comment[fi]=Latte-telakan tehtäväsovelma

View File

@ -57,6 +57,7 @@ Comment[zh_TW]=由 Latte Dock 提供的 Shell
Keywords=shell
Keywords[ca]=intèrpret d'ordres
Keywords[ca@valencia]=intèrpret d'ordres
Keywords[cs]=shell
Keywords[da]=skal
Keywords[de]=Shell
Keywords[el]=κέλυφος

View File

@ -57,6 +57,7 @@ Comment[zh_TW]=由 Latte Dock 提供的 Shell
Keywords=shell
Keywords[ca]=intèrpret d'ordres
Keywords[ca@valencia]=intèrpret d'ordres
Keywords[cs]=shell
Keywords[da]=skal
Keywords[de]=Shell
Keywords[el]=κέλυφος