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"
KDE · Jul 13, 2020 · fb5b5ab · fb5b5ab
1 parent 0e2ef25
commit fb5b5ab
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/amarok-contextapplet.desktop b/src/amarok-contextapplet.desktop
@@ -6,7 +6,7 @@ Comment[be]=Утулка для Amarok
 Comment[bg]=Приставка за Amarok
 Comment[bs]=Priključak za Amarok
 Comment[ca]=Connector per a l'Amarok
-Comment[ca@valencia]=Connector per l'Amarok
+Comment[ca@valencia]=Connector per a l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[csb]=Wtëkôcz dlô Amaroka
 Comment[da]=Plugin til Amarok

diff --git a/src/amarok-plugin.desktop b/src/amarok-plugin.desktop
@@ -6,7 +6,7 @@ Comment[be]=Утулка для Amarok
 Comment[bg]=Приставка за Amarok
 Comment[bs]=Priključak za Amarok
 Comment[ca]=Connector per a l'Amarok
-Comment[ca@valencia]=Connector per l'Amarok
+Comment[ca@valencia]=Connector per a l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[csb]=Wtëkôcz dlô Amaroka
 Comment[da]=Plugin til Amarok

diff --git a/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop b/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop
@@ -45,7 +45,7 @@ Name[zh_TW]=iPod, iPad 與 iPhone 收藏
 Comment=Plugin to use iPod-like devices as collections in Amarok
 Comment[bs]=Priključak za korištenje uređaja poput iPod-a kao kolekcija u Amaroku
 Comment[ca]=Connector per a usar dispositius de tipus iPod com a col·leccions en l'Amarok
-Comment[ca@valencia]=Connector per utilitzar dispositius de tipus iPod com a col·leccions en l'Amarok
+Comment[ca@valencia]=Connector per a usar dispositius de tipus iPod com a col·leccions en l'Amarok
 Comment[cs]=Modul pro využití zařízení jako např. iPod jako sbírky pro AmaroK
 Comment[da]=Plugin til at bruge iPod-lignende enheder som samlinger i Amarok
 Comment[de]=Modul für die Verwendung von Geräten wie dem iPod als Sammlung in Amarok

diff --git a/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop b/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop
@@ -36,7 +36,7 @@ Name[zh_TW]=MySQLe 儲存空間
 Comment=Storage plugin for Amarok
 Comment[bs]=Priključak za Amarok
 Comment[ca]=Connector d'emmagatzematge per a l'Amarok
-Comment[ca@valencia]=Connector d'emmagatzematge per l'Amarok
+Comment[ca@valencia]=Connector d'emmagatzematge per a l'Amarok
 Comment[cs]=Modul úložiště pro AmaroK
 Comment[da]=Lagrings-plugin til Amarok
 Comment[de]=Speicher-Modul für Amarok

diff --git a/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop b/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop
@@ -36,7 +36,7 @@ Name[zh_TW]=MySQLServer 儲存空間
 Comment=Storage plugin for Amarok
 Comment[bs]=Priključak za Amarok
 Comment[ca]=Connector d'emmagatzematge per a l'Amarok
-Comment[ca@valencia]=Connector d'emmagatzematge per l'Amarok
+Comment[ca@valencia]=Connector d'emmagatzematge per a l'Amarok
 Comment[cs]=Modul úložiště pro AmaroK
 Comment[da]=Lagrings-plugin til Amarok
 Comment[de]=Speicher-Modul für Amarok

diff --git a/src/scripting/scripts/radio_station_service/script.desktop b/src/scripting/scripts/radio_station_service/script.desktop
@@ -40,7 +40,7 @@ Name[zh_TW]=Cool Streams
 Comment=A script that sets up a service with a few cool internet radio stations
 Comment[bs]=Skripta koja postavlja uslugu sa nekoliko odličnih radio stanica.
 Comment[ca]=Un script que configura un servei amb diverses estacions de ràdio interessants per Internet
-Comment[ca@valencia]=Un script que configura un servei amb diverses estacions de ràdio per Internet interessants
+Comment[ca@valencia]=Un script que configura un servei amb diverses estacions de ràdio interessants per Internet
 Comment[cs]=Skvělé proudy
 Comment[da]=Et script som sætter en tjeneste op med nogle få fede internet-radioer
 Comment[de]=Ein Skript, das einen Dienst mit einigen coolen Internet-Radiostationen einrichtet