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"
5 years ago · 7554e8c409
parent d278ea171b
commit 7554e8c409
10 changed files with 17 additions and 0 deletions
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@ -2,6 +2,7 @@
 Name=Latte Indicators
 Name[ca]=Indicadors del Latte
 Name[ca@valencia]=Indicadors del Latte
+Name[cs]=Ukazatele Latte
 Name[el]=Δείκτες Latte
 Name[en_GB]=Latte Indicators
 Name[es]=Indicadores de Latte
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@ -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[el]=Επιτυχής εισαγωγή
 Name[en_GB]=Imported successfully
@ -88,6 +89,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[el]=Αποτυχία εισαγωγής
 Name[en_GB]=Failed to import
@ -115,6 +117,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[el]=Επιτυχής εξαγωγή
 Name[en_GB]=Exported successfully
@ -142,6 +145,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[el]=Αποτυχία εξαγωγής
 Name[en_GB]=Failed to export
@ -169,6 +173,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[el]=Επιτυχής αφαίρεση
 Name[en_GB]=Removed successfully
@ -196,6 +201,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[el]=Αποτυχία αφαίρεσης
 Name[en_GB]=Failed to remove
--- a/app/packageplugins/indicator/latte-indicator.desktop
+++ b/app/packageplugins/indicator/latte-indicator.desktop
@ -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[el]=Δείκτης Latte
 Comment[en_GB]=Latte indicator
 Comment[es]=Indicador Latte
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@ -2,6 +2,7 @@
 Name=Indicator
 Name[ca]=Indicador
 Name[ca@valencia]=Indicador
+Name[cs]=Ukazatel
 Name[el]=Δείκτης
 Name[en_GB]=Indicator
 Name[es]=Indicador
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@ -29,6 +29,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[el]=Προκαθορισμένος δείκτης Latte
 Comment[en_GB]=Latte default indicator
 Comment[es]=Indicador por omisión de Latte
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@ -28,6 +28,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[el]=Δείκτης Latte σε στιλ Plasma
 Comment[en_GB]=Latte Plasma style indicator
 Comment[es]=Estilo del indicador Plasma Latte
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@ -2,6 +2,7 @@
 Name=Latte Tasks
 Name[ca]=Tasques del Latte
 Name[ca@valencia]=Tasques del Latte
+Name[cs]=Úlohy Latte
 Name[el]=Εργασίες Latte
 Name[en_GB]=Latte Tasks
 Name[es]=Tareas de Latte
@ -25,6 +26,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[el]=Γραφικό συστατικό εργασιών από Latte Dock
 Comment[en_GB]=Tasks plasmoid from Latte Dock
 Comment[es]=Plasmoide de tareas de Latte Dock
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -2,6 +2,7 @@
 Name=Latte Tasks
 Name[ca]=Tasques del Latte
 Name[ca@valencia]=Tasques del Latte
+Name[cs]=Úlohy Latte
 Name[el]=Εργασίες Latte
 Name[en_GB]=Latte Tasks
 Name[es]=Tareas de Latte
@ -25,6 +26,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[el]=Γραφικό συστατικό εργασιών από Latte Dock
 Comment[en_GB]=Tasks plasmoid from Latte Dock
 Comment[es]=Plasmoide de tareas de Latte Dock
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@ -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]=κέλυφος
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@ -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]=κέλυφος