Release Catima 2.38.0

Replace Gradle update checker

.design/README.txt

@@ -0,0 +1,4 @@
+VectorDrawable does not support all SVG features, such as shadows and masks.
+Therefore the ic_launcher files are slightly different from the master files: no shadows, minor color tweaks, path optimisation.
+Use ic_launcher_*.svg files to generate assets for the app icon
+Use master_*.svg files to generate other assets (e.g. feature graphic, playstore icon) or to rework the icon design

.design/ic_launcher_background.svg

@@ -0,0 +1,3 @@
+<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="108" height="108" fill="#1F4262"/>
+</svg>

.design/ic_launcher_foreground.svg

@@ -0,0 +1,18 @@
+<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M45.5 30.5768L68.0526 22.3683C70.1285 21.6127 72.4239 22.6831 73.1795 24.759L75.9156 32.2765L49.6042 41.8531L45.5 30.5768Z" fill="#F5A3A3"/>
+<path d="M70.3604 25.785C70.1715 25.2661 69.5977 24.9985 69.0787 25.1874L49.3451 32.3698L51.3973 38.008L72.0705 30.4835L70.3604 25.785ZM75.9156 32.2765L49.6042 41.8531L45.5 30.5768L68.0526 22.3683C70.1285 21.6127 72.4239 22.6831 73.1795 24.759L75.9156 32.2765Z" fill="#CF1717"/>
+<path d="M58.4155 30.5767L35.8629 22.3682C33.787 21.6126 31.4916 22.683 30.7361 24.7589L27.9999 32.2764L54.3113 41.853L58.4155 30.5767Z" fill="#F5A3A3"/>
+<path d="M33.5551 25.7849C33.744 25.2659 34.3179 24.9984 34.8368 25.1873L54.5704 32.3697L52.5183 38.0078L31.845 30.4834L33.5551 25.7849ZM27.9999 32.2764L54.3113 41.853L58.4155 30.5767L35.8629 22.3682C33.787 21.6126 31.4916 22.683 30.7361 24.7589L27.9999 32.2764Z" fill="#DD1818"/>
+<path d="M28.6958 37.5992C29.0794 35.4236 31.1543 33.9709 33.3298 34.3545L80.6006 42.6897C82.7761 43.0734 84.2288 45.148 83.8452 47.3235L81.8157 58.8328C82.2998 59.0988 84.6663 60.1572 87.416 57.2288V57.229C87.9156 56.6942 88.4507 56.2283 89.0068 55.8575C91.764 54.0193 93.9993 55.2156 93.9993 58.5293C93.9992 61.343 92.3876 64.7782 90.2134 66.8763C86.626 70.5423 80.6933 70.5552 79.7524 70.5332L77.5938 82.7766C77.2101 84.9522 75.1355 86.4049 72.96 86.0213L25.6892 77.6861C25.6723 77.6831 25.6555 77.6797 25.6387 77.6765C23.4483 77.3198 22.0001 76.7026 22 76.0003C22 75.7175 22.2348 75.4485 22.6582 75.2046C22.3986 74.5429 22.3121 73.8036 22.4446 73.0523L28.6958 37.5992Z" fill="#B81414"/>
+<path d="M90.6707 60.748C90.6707 61.8526 89.9257 63.2447 89.0066 63.8574C88.0876 64.4701 87.3425 64.0714 87.3425 62.9668C87.3425 61.8622 88.0876 60.4701 89.0066 59.8574C89.9257 59.2447 90.6707 59.6434 90.6707 60.748Z" fill="#E82E2E"/>
+<path d="M78 30C80.2091 30 82 31.7909 82 34V70C82 72.2091 80.2091 74 78 74H30C25.5817 74 22 74.8954 22 76V32C22 30.8954 25.5817 30 30 30H78Z" fill="#E82E2E"/>
+<path d="M51.2008 54.25C51.615 53.5325 52.5324 53.2867 53.2498 53.7009C53.9449 54.1022 54.1973 54.9757 53.8358 55.6822L53.762 55.8178C53.4005 56.5242 53.6529 57.3977 54.3479 57.799C55.043 58.2003 55.9256 57.9821 56.3567 57.3158L56.4372 57.1841C56.8683 56.5178 57.751 56.2997 58.446 56.7009C59.1634 57.1151 59.4092 58.0325 58.995 58.75C57.7524 60.9023 55.0002 61.6397 52.8479 60.3971C50.6956 59.1544 49.9582 56.4023 51.2008 54.25Z" fill="#8A0F0F"/>
+<path d="M52.795 54.25C52.3808 53.5325 51.4634 53.2867 50.746 53.7009C50.051 54.1022 49.7986 54.9757 50.1601 55.6822L50.2339 55.8178C50.5954 56.5242 50.343 57.3977 49.6479 57.799C48.9529 58.2003 48.0702 57.9821 47.6392 57.3158L47.5586 57.1841C47.1276 56.5178 46.2449 56.2997 45.5499 56.7009C44.8324 57.1151 44.5866 58.0325 45.0008 58.75C46.2435 60.9023 48.9956 61.6397 51.1479 60.3971C53.3002 59.1544 54.0377 56.4023 52.795 54.25Z" fill="#8A0F0F"/>
+<path d="M53.2989 56.75C52.7216 57.75 51.2782 57.75 50.7009 56.75L48.1028 52.25C47.5254 51.25 48.2471 50 49.4018 50L54.598 50C55.7527 50 56.4744 51.25 55.897 52.25L53.2989 56.75Z" fill="#8A0F0F"/>
+<path d="M40.4999 40.5C43.7321 40.5 46.4561 42.6167 47.4233 45.5269C47.6845 46.313 47.2592 47.162 46.4731 47.4233C45.687 47.6846 44.8379 47.2592 44.5766 46.4731C43.9982 44.7328 42.3813 43.5 40.4999 43.5C38.6186 43.5 37.0016 44.7328 36.4233 46.4731C36.162 47.2592 35.3129 47.6846 34.5268 47.4233C33.7407 47.162 33.3153 46.313 33.5766 45.5269C34.5438 42.6167 37.2678 40.5 40.4999 40.5Z" fill="#8A0F0F"/>
+<path d="M63.4999 40.5C66.7321 40.5 69.4561 42.6167 70.4233 45.5269C70.6845 46.313 70.2592 47.162 69.4731 47.4233C68.687 47.6846 67.8379 47.2592 67.5766 46.4731C66.9982 44.7328 65.3813 43.5 63.4999 43.5C61.6186 43.5 60.0016 44.7328 59.4233 46.4731C59.162 47.2592 58.3129 47.6846 57.5268 47.4233C56.7407 47.162 56.3153 46.313 56.5766 45.5269C57.5438 42.6167 60.2678 40.5 63.4999 40.5Z" fill="#8A0F0F"/>
+<path d="M26 55C25.4477 55 25 54.5523 25 54C25 53.4477 25.4477 53 26 53H42C42.5523 53 43 53.4477 43 54C43 54.5523 42.5523 55 42 55H26Z" fill="#8A0F0F"/>
+<path d="M26.3511 60.9363C25.834 61.1302 25.2576 60.8682 25.0637 60.3511C24.8698 59.834 25.1318 59.2575 25.6489 59.0636L41.6488 53.0637C42.1659 52.8698 42.7423 53.1318 42.9362 53.6489C43.1302 54.166 42.8681 54.7424 42.351 54.9363L26.3511 60.9363Z" fill="#8A0F0F"/>
+<path d="M61.649 54.9364C61.1319 54.7425 60.8699 54.1661 61.0638 53.6489C61.2577 53.1318 61.8341 52.8698 62.3512 53.0637L78.3511 59.0637C78.8682 59.2576 79.1302 59.834 78.9363 60.3511C78.7424 60.8683 78.166 61.1303 77.6489 60.9364L61.649 54.9364Z" fill="#8A0F0F"/>
+<path d="M78 55C78.5523 55 79 54.5523 79 54C79 53.4477 78.5523 53 78 53H62C61.4477 53 61 53.4477 61 54C61 54.5523 61.4477 55 62 55H78Z" fill="#8A0F0F"/>
+</svg>

.design/ic_launcher_monochrome.svg

@@ -0,0 +1,10 @@
+<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M75 31.0001C78.3137 31.0001 81 33.6864 81 37.0001V44.4339C81.8278 45.6739 82.1977 47.2224 81.9185 48.8065L81 54.0147V55.8692C81.2385 55.7207 81.5023 55.5135 81.7856 55.2232L81.864 55.1412C82.3815 54.5878 82.9573 54.0824 83.5825 53.6656L83.7239 53.5736C85.1958 52.6378 87.0298 52.1726 88.6753 53.0533C90.3738 53.9624 90.9907 55.8341 90.9907 57.6305L90.9895 57.7735C90.9384 60.7815 89.2885 64.1632 87.1213 66.2555L87.1211 66.2552C85.2162 68.1795 82.7376 69.0841 80.7588 69.5221C80.6417 69.548 80.5255 69.572 80.4106 69.5951C79.8487 70.7645 78.9192 71.7235 77.7715 72.3223L76.709 78.3509C76.1335 81.6141 73.0215 83.7931 69.7583 83.2179L30.3657 76.2718C30.328 76.2652 30.292 76.2576 30.2576 76.2508C29.124 76.0893 28.0601 75.8434 27.2224 75.4942C26.8046 75.32 26.3313 75.075 25.9299 74.7176C25.538 74.3686 25.0098 73.7183 25.0005 72.7752C25.0005 72.7766 25.0007 72.778 25.0007 72.7794C25.0006 72.7696 25 72.7599 25 72.7501V34.5001C25 33.8368 25.3232 33.2494 25.8203 32.8856C26.2266 32.4885 26.6978 32.2406 27.0352 32.0872C27.6048 31.8283 28.2727 31.6301 28.9683 31.4781C29.7466 31.308 30.6353 31.1794 31.5925 31.0987C31.5854 31.0993 31.5784 31.0998 31.5713 31.1004L32.6726 28.0748L32.7275 27.93C33.9136 24.9114 37.2979 23.3732 40.363 24.4888L52.8337 29.0277L65.3047 24.4888C68.4185 23.3555 71.8617 24.9609 72.9951 28.0748L74.0598 31.0001H75ZM34.8474 73.0001L70.4529 79.2784C71.5406 79.4701 72.5777 78.7437 72.7695 77.6561L73.5906 73.0001H34.8474ZM34 35.0001C32.3461 35.0001 30.8829 35.1543 29.8225 35.3861C29.4849 35.4599 29.2118 35.5362 29 35.6082V69.4718C30.4021 69.1686 32.1493 69.0001 34 69.0001H75L75.103 68.9974C76.1256 68.9455 76.9454 68.1256 76.9973 67.1031L77 67.0001V37.0001C77 35.8955 76.1046 35.0001 75 35.0001H34ZM86.782 56.5904C86.6812 56.5851 86.3996 56.6115 85.8818 56.9412L85.8013 56.9937C85.4702 57.2144 85.1253 57.5101 84.7834 57.8761C84.7824 57.8772 84.7811 57.8783 84.78 57.8795L84.6406 58.025C83.4435 59.2483 82.1848 59.8799 81 60.1214V65.3201C82.1999 64.9382 83.3456 64.358 84.219 63.5015L84.343 63.3775C85.8843 61.8895 86.9907 59.4316 86.9907 57.6305L86.9897 57.5343C86.9769 56.9198 86.8422 56.671 86.782 56.5904ZM46.5574 31.0001L38.9949 28.2476C37.9893 27.8817 36.8807 28.3724 36.469 29.347L36.4314 29.4429L35.8645 31.0001H46.5574ZM69.803 31.0001L69.2363 29.4429C68.8586 28.4051 67.7109 27.8698 66.6729 28.2476L59.1104 31.0001H69.803Z" fill="black"/>
+<path d="M55.165 51C56.3197 51.0001 57.0412 52.25 56.4639 53.25L54.6943 56.3145C54.5983 56.7617 54.7947 57.2387 55.2122 57.4797C55.7303 57.7788 56.3927 57.6015 56.6919 57.0835C57.1061 56.3661 58.0235 56.1202 58.741 56.5344C59.4584 56.9487 59.7042 57.8661 59.29 58.5835C58.1625 60.5364 55.6651 61.2054 53.7122 60.0779C53.4495 59.9262 53.2103 59.7495 52.9954 59.553C52.7804 59.7495 52.5414 59.9263 52.2788 60.0779C50.3258 61.2055 47.8283 60.5365 46.7007 58.5835C46.2865 57.8661 46.5324 56.9487 47.2498 56.5344C47.9672 56.1202 48.8846 56.3661 49.2988 57.0835C49.598 57.6016 50.2607 57.7789 50.7788 57.4797C51.2042 57.2341 51.3997 56.7436 51.2905 56.2891L49.5359 53.25C48.9586 52.25 49.6801 51.0001 50.8347 51H55.165Z" fill="black"/>
+<path d="M43.2499 42.5C46.0011 42.5 48.4844 44.0694 49.4008 46.4639C49.6968 47.2376 49.3097 48.1048 48.536 48.4009C47.7623 48.697 46.8951 48.3098 46.599 47.5361C46.1806 46.4427 44.9148 45.5 43.2499 45.5C41.5849 45.5 40.3192 46.4427 39.9008 47.5361C39.6047 48.3098 38.7374 48.697 37.9637 48.4009C37.1901 48.1048 36.8029 47.2376 37.099 46.4639C38.0153 44.0694 40.4987 42.5 43.2499 42.5Z" fill="black"/>
+<path d="M62.7499 42.5C65.5011 42.5 67.9844 44.0694 68.9008 46.4639C69.1968 47.2376 68.8097 48.1048 68.036 48.4009C67.2623 48.697 66.3951 48.3098 66.099 47.5361C65.6806 46.4427 64.4148 45.5 62.7499 45.5C61.0849 45.5 59.8192 46.4427 59.4008 47.5361C59.1047 48.3098 58.2374 48.697 57.4637 48.4009C56.6901 48.1048 56.3029 47.2376 56.599 46.4639C57.5153 44.0694 59.9987 42.5 62.7499 42.5Z" fill="black"/>
+<path d="M33 55C32.1716 55 31.5 54.3284 31.5 53.5C31.5 52.6716 32.1716 52 33 52H44.25C45.0784 52 45.75 52.6716 45.75 53.5C45.75 54.3284 45.0784 55 44.25 55H33Z" fill="black"/>
+<path d="M33.6106 59.8701C32.8538 60.2073 31.9671 59.8671 31.6299 59.1104C31.2928 58.3537 31.6329 57.467 32.3896 57.1298L43.6118 52.1298C44.3685 51.7926 45.2553 52.1328 45.5924 52.8895C45.9296 53.6462 45.5894 54.533 44.8327 54.8701L33.6106 59.8701Z" fill="black"/>
+<path d="M60.8488 54.8768C60.0885 54.5478 59.7389 53.6647 60.0678 52.9044C60.3968 52.1441 61.2798 51.7945 62.0401 52.1234L73.5957 57.1233C74.356 57.4523 74.7056 58.3353 74.3767 59.0956C74.0477 59.8559 73.1647 60.2056 72.4043 59.8766L60.8488 54.8768Z" fill="black"/>
+<path d="M73 52C73.8284 52 74.5 52.6716 74.5 53.5C74.5 54.3284 73.8284 55 73 55H61.5C60.6716 55 60 54.3284 60 53.5C60 52.6716 60.6716 52 61.5 52H73Z" fill="black"/>
+</svg>

.design/master_color.svg

@@ -0,0 +1,69 @@
+<svg width="432" height="432" viewBox="0 0 432 432" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="432" height="432" fill="#1F4262"/>
+<g filter="url(#filter0_d_39_7)">
+<path d="M182 122.308L272.21 89.4737C280.514 86.4514 289.696 90.7328 292.718 99.0364L303.663 129.107L198.417 167.413L182 122.308Z" fill="#F5A3A3"/>
+<path d="M274.263 95.1118C279.452 93.2229 285.191 95.8988 287.08 101.089L295.972 125.521L202.003 159.723L189.69 125.894L274.263 95.1118Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter1_d_39_7)">
+<path d="M233.662 122.307L143.452 89.4727C135.148 86.4504 125.966 90.7318 122.944 99.0355L112 129.106L217.245 167.412L233.662 122.307Z" fill="#F5A3A3"/>
+<path d="M141.399 95.1109C136.21 93.2219 130.471 95.8978 128.582 101.088L119.69 125.52L213.659 159.722L225.972 125.893L141.399 95.1109Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter2_d_39_7)">
+<path d="M114.783 150.397C116.318 141.695 124.617 135.884 133.319 137.419L322.402 170.759C331.104 172.293 336.915 180.592 335.381 189.294L327.263 235.331C329.199 236.395 338.665 240.629 349.664 228.915V228.916C351.663 226.777 353.803 224.913 356.027 223.43C367.056 216.077 375.997 220.862 375.997 234.117C375.997 245.372 369.551 259.113 360.854 267.505C346.504 282.169 322.773 282.222 319.01 282.134L310.375 331.106C308.841 339.809 300.542 345.619 291.84 344.085L102.757 310.745C102.684 310.732 102.611 310.717 102.538 310.703C93.7855 309.276 88 306.809 88 304.001C88 302.87 88.9396 301.794 90.6338 300.818C89.5953 298.172 89.2485 295.215 89.7783 292.21L114.783 150.397Z" fill="#B81414"/>
+</g>
+<circle cx="8" cy="8" r="8" transform="matrix(0.83205 -0.5547 0 1 349.37 243.867)" fill="#E82E2E"/>
+<g filter="url(#filter3_d_39_7)">
+<path d="M312 120C320.837 120 328 127.163 328 136V280C328 288.837 320.837 296 312 296H120C102.327 296 88 299.582 88 304V128C88 123.582 102.327 120 120 120H312Z" fill="#E82E2E"/>
+</g>
+<path d="M230.785 232C227.471 237.74 220.132 239.706 214.392 236.392C208.653 233.079 206.686 225.74 210 220" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M185.2 232C188.513 237.74 195.853 239.706 201.592 236.392C207.332 233.079 209.298 225.74 205.984 220" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M213.196 227C210.887 231 205.113 231 202.804 227L192.412 209C190.102 205 192.989 200 197.608 200L218.392 200C223.011 200 225.898 205 223.588 209L213.196 227Z" fill="#8A0F0F"/>
+<path d="M184 184C180.909 174.699 172.227 168 162 168C151.773 168 143.091 174.699 140 184" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M276 184C272.909 174.699 264.227 168 254 168C243.773 168 235.091 174.699 232 184" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M168 216H104" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M168 216L104 240" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M312 240L248 216" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M248 216H312" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<defs>
+<filter id="filter0_d_39_7" x="166" y="72.5049" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+<filter id="filter1_d_39_7" x="95.9995" y="72.5039" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+<filter id="filter2_d_39_7" x="72" y="121.173" width="319.997" height="239.158" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+<filter id="filter3_d_39_7" x="72" y="104" width="272" height="216" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+</defs>
+</svg>

.github/workflows/changelog-to-fastlane.yml

@@ -29,7 +29,7 @@ jobs:
       id: checkout
       uses: actions/checkout@v5.0.0
     - name: Setup Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         python-version: '3.x'
     - name: Run converter script

.github/workflows/update-gradle-wrapper.yml

@@ -0,0 +1,30 @@
+name: Update Gradle Wrapper
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+permissions:
+  actions: none
+  checks: none
+  contents: write
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@v2

.scripts/dump_stocard_stores.py

@@ -1,44 +0,0 @@
-#!/usr/bin/python3
-
-import csv
-import json
-import msgpack
-
-MSGPACK = "bootstrapdata.msgpack"
-OUTFILE = "stocard_stores.csv"
-
-
-def load(fh):
-    data = []
-    for r in msgpack.Unpacker(fh, raw=False):
-        if r["collection"] == "/loyalty-card-providers/":
-            d = json.loads(r["data"])
-            data.append([r["resource_id"], d["name"], d["default_barcode_format"]])
-    return data
-
-
-def save(data, output_file=OUTFILE):
-    with open(output_file, "w") as fh:
-        writer = csv.writer(fh, lineterminator="\n")
-        writer.writerow(["_id", "name", "barcodeFormat"])
-        for row in data:
-            writer.writerow(row)
-
-
-if __name__ == "__main__":
-    import argparse
-    parser = argparse.ArgumentParser(
-        epilog=f"INPUT_FILE must be a .msgpack or .apk and defaults to {MSGPACK}; "
-               f"OUTPUT_FILE defaults to {OUTFILE}")
-    parser.add_argument("input_file", metavar="INPUT_FILE", nargs="?", default=MSGPACK)
-    parser.add_argument("output_file", metavar="OUTPUT_FILE", nargs="?", default=OUTFILE)
-    args = parser.parse_args()
-    if args.input_file.lower().endswith(".apk"):
-        import zipfile
-        with zipfile.ZipFile(args.input_file) as zf:
-            with zf.open(f"assets/{MSGPACK}") as fh:
-                data = load(fh)
-    else:
-        with open(args.input_file, "rb") as fh:
-            data = load(fh)
-    save(data, args.output_file)

.scripts/generate_feature_graphic/featureGraphic.svg

@@ -1,15 +1,76 @@
 <svg width="1024" height="500" viewBox="0 0 1024 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="1024" height="500" fill="#223355"/>
-<text direction="ltr" fill="white" xml:space="preserve" style="" font-family="Yesteryear" font-size="150" letter-spacing="0em"><tspan x="470.082" y="285.511">Catima
-</tspan></text>
-<path d="M381.046 147.001L236.3 211.446L276.524 301.79L421.27 237.345L381.046 147.001Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M402.077 219.13L240.07 147L191.984 255.004L353.99 327.135L402.077 219.13Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M437.17 236.241L251.831 183.096L220.071 293.855L405.41 347L437.17 236.241Z" fill="#C80000" stroke="#C80000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M412.879 178.633H220.071V293.855H412.879V178.633Z" fill="#FF0000" stroke="#FF0000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M221.482 296.217C238.316 296.217 251.963 269.366 251.963 236.244C251.963 203.121 238.316 176.27 221.482 176.27C204.647 176.27 191 203.121 191 236.244C191 269.366 204.647 296.217 221.482 296.217Z" fill="#FF0000" stroke="#FF0000" stroke-width="3.44232" stroke-linejoin="round"/>
-<path d="M307.256 250.444C307.256 253.187 306.289 255.842 304.526 257.944C302.763 260.045 300.316 261.458 297.614 261.934C294.913 262.41 292.13 261.92 289.755 260.548C287.379 259.177 285.563 257.012 284.625 254.435" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M330.301 254.298C329.363 256.875 327.547 259.04 325.171 260.411C322.796 261.783 320.013 262.273 317.312 261.797C314.61 261.321 312.163 259.908 310.4 257.807C308.637 255.706 307.671 253.05 307.671 250.307" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M248.345 225.937L266.818 207.465L285.29 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<path d="M329.625 225.937L348.098 207.465L366.571 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<text direction="ltr" fill="white" xml:space="preserve" style="" font-family="Lexend Deca" font-size="35" font-weight="200" letter-spacing="0em"><tspan x="466" y="340">Loyalty Card Wallet</tspan></text>
+<g clip-path="url(#clip0_78_203)">
+<path d="M1024 0H0V500H1024V0Z" fill="#1F4262"/>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lexend" font-size="35" letter-spacing="0em"><tspan x="481" y="325">Loyalty Card Wallet</tspan></text>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lobster" font-size="150" letter-spacing="0em"><tspan x="469" y="270">Catima</tspan></text>
+<g filter="url(#filter0_d_78_203)">
+<path d="M218 156.307L308.21 123.473C316.514 120.45 325.696 124.732 328.718 133.035L339.663 163.106L234.417 201.412L218 156.307Z" fill="#F5A3A3"/>
+<path d="M310.263 129.111C315.452 127.222 321.191 129.898 323.08 135.088L331.972 159.52L238.003 193.722L225.69 159.893L310.263 129.111Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter1_d_78_203)">
+<path d="M269.662 156.307L179.452 123.473C171.148 120.45 161.966 124.732 158.944 133.035L148 163.106L253.245 201.412L269.662 156.307Z" fill="#F5A3A3"/>
+<path d="M177.399 129.111C172.21 127.222 166.471 129.898 164.582 135.088L155.69 159.52L249.659 193.722L261.972 159.893L177.399 129.111Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter2_d_78_203)">
+<path d="M150.783 184.396C152.318 175.694 160.617 169.884 169.319 171.418L358.402 204.759C367.104 206.293 372.915 214.592 371.381 223.294L363.263 269.331C365.199 270.395 374.665 274.629 385.664 262.915V262.916C387.662 260.777 389.802 258.913 392.027 257.43C403.056 250.077 411.997 254.862 411.997 268.117C411.997 279.372 405.55 293.113 396.853 301.505C382.504 316.169 358.773 316.221 355.01 316.133L346.375 365.106C344.84 373.809 336.542 379.619 327.84 378.085L138.757 344.744C138.689 344.732 138.622 344.719 138.555 344.706C129.793 343.279 124 340.81 124 338.001C124 336.87 124.939 335.794 126.633 334.818C125.594 332.171 125.248 329.214 125.778 326.209L150.783 184.396Z" fill="#B81414"/>
+</g>
+<circle cx="8" cy="8" r="8" transform="matrix(0.83205 -0.5547 0 1 385.37 277.867)" fill="#E82E2E"/>
+<g filter="url(#filter3_d_78_203)">
+<path d="M348 154C356.837 154 364 161.163 364 170V314C364 322.837 356.837 330 348 330H156C138.327 330 124 333.582 124 338V162C124 157.582 138.327 154 156 154H348Z" fill="#E82E2E"/>
+</g>
+<path d="M266.784 266C263.471 271.74 256.132 273.706 250.392 270.392C244.653 267.079 242.686 259.74 246 254" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M221.2 266C224.514 271.74 231.853 273.706 237.592 270.392C243.332 267.079 245.298 259.74 241.984 254" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M249.196 261C246.887 265 241.113 265 238.804 261L228.412 243C226.102 239 228.989 234 233.608 234L254.392 234C259.011 234 261.898 239 259.588 243L249.196 261Z" fill="#8A0F0F"/>
+<path d="M220 218C216.909 208.699 208.227 202 198 202C187.773 202 179.091 208.699 176 218" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M312 218C308.909 208.699 300.227 202 290 202C279.773 202 271.091 208.699 268 218" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M204 250H140" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M204 250L140 274" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M348 274L284 250" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M284 250H348" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+</g>
+<defs>
+<filter id="filter0_d_78_203" x="202" y="106.504" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<filter id="filter1_d_78_203" x="132" y="106.504" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<filter id="filter2_d_78_203" x="108" y="155.172" width="319.997" height="239.159" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<filter id="filter3_d_78_203" x="108" y="138" width="272" height="216" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<clipPath id="clip0_78_203">
+<rect width="1024" height="500" fill="white"/>
+</clipPath>
+</defs>
 </svg>

.scripts/generate_feature_graphic/fonts/Lexend/OFL.txt

@@ -2,7 +2,7 @@ Copyright 2018 The Lexend Project Authors (https://github.com/googlefonts/lexend
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://openfontlicense.org
 
 
 -----------------------------------------------------------

.scripts/generate_feature_graphic/fonts/Lobster/OFL.txt

@@ -1,9 +1,8 @@
-Copyright (c) 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI)
-(astigma@astigmatic.com), with Reserved Font Names "Yesteryear"
+Copyright 2010 The Lobster Project Authors (https://github.com/impallari/The-Lobster-Font), with Reserved Font Name "Lobster".
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://openfontlicense.org
 
 
 -----------------------------------------------------------

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -33,20 +33,21 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
     perl -pi -e 's/Catima/$ENV{appname}/' featureGraphic.svg
     perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
     # Set correct font or font size for language if needed
-    # (Lexend Deca has limited support and some characters are big)
-    # We specifically need the Serif version because of the 200 weight
+    # (Lobster and Lexend have limited language support)
     case "$(basename "$lang")" in
-      bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
-      fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Yesteryear/Noto Sans Arabic/" -e "s/Lexend Deca/Noto Sans Arabic/" featureGraphic.svg ;;
-      hi-IN) sed -i -e "s/Yesteryear/Noto Sans Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
-      ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
-      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e "s/Yesteryear/Noto Serif Kannada/" featureGraphic.svg ;;
-      ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
-      zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
-      zh-TW) sed -i -e "s/Yesteryear/Noto Sans CJK TC/" -e "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
+      bg|el-GR|ru-RU|uk) sed -i "s/Lexend/Noto Sans/" featureGraphic.svg ;;
+      ar|fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Lobster/Noto Sans Arabic/" -e "s/Lexend/Noto Sans Arabic/" featureGraphic.svg ;;
+      he-IL) sed -i -e "s/Lobster/Noto Sans Hebrew/" -e "s/Lexend/Noto Sans Hebrew/" featureGraphic.svg ;;
+      hi-IN) sed -i -e "s/Lobster/Noto Sans Devanagari/" -e "s/Lexend/Noto Sans Devanagari/" featureGraphic.svg ;;
+      ja-JP) sed -i "s/Lexend/Noto Sans CJK JP/" featureGraphic.svg ;;
+      kn-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' -e "s/Lobster/Noto Sans Kannada/" -e "s/Lexend/Noto Sans Kannada/" featureGraphic.svg ;;
+      ko) sed -i "s/Lexend/Noto Sans CJK KR/" featureGraphic.svg ;;
+      zh-CN) sed -i "s/Lexend/Noto Sans CJK SC/" featureGraphic.svg ;;
+      zh-TW) sed -i -e "s/Lobster/Noto Sans CJK TC/" -e "s/Lexend/Noto Sans CJK TC/" featureGraphic.svg ;;
       *) ;;
     esac
   fi
+
   # Ensure images directory exists
   mkdir -p images
   # Generate .png (we use Inkscape because ImageMagick ignores RTL)

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v2.38.0 - 152 (2025-09-12)
+
+- Add support for .pkpasses files
+- Remove Stocard importer (Stocard no longer exists)
+- Temporarily disable widget images below Android 12L (workaround for a crash issue)
+
+## v2.37.0 - 151 (2025-08-22)
+
+- New redesign of the Catima logo
+- Translation updates
+
 ## v2.36.0 - 150 (2025-08-05)
 
 - Add a widget showing all non-archived cards

app/build.gradle.kts

@@ -17,8 +17,8 @@ android {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
         targetSdk = 35
-        versionCode = 150
-        versionName = "2.36.0"
+        versionCode = 152
+        versionName = "2.38.0"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
@@ -117,7 +117,7 @@ dependencies {
     implementation("androidx.exifinterface:exifinterface:1.4.1")
     implementation("androidx.palette:palette:1.0.0")
     implementation("androidx.preference:preference:1.2.1")
-    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.google.android.material:material:1.13.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 
     // Third-party
@@ -133,7 +133,7 @@ dependencies {
     val junitVersion = "4.13.2"
     testImplementation("androidx.test:core:$androidXTestVersion")
     testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:4.15.1")
+    testImplementation("org.robolectric:robolectric:4.16")
 
     androidTestImplementation("androidx.test:core:$androidXTestVersion")
     androidTestImplementation("junit:junit:$junitVersion")

app/src/debug/res/values-zh-rTW/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Catima 除錯版</string>
-</resources>
+    <string name="app_name">卡提碼除錯版</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <permission
         android:description="@string/permissionReadCardsDescription"
-        android:icon="@drawable/ic_launcher_foreground"
+        android:icon="@drawable/ic_launcher_monochrome"
         android:label="@string/permissionReadCardsLabel"
         android:name="${applicationId}.READ_CARDS"
         android:protectionLevel="dangerous" />
@@ -65,6 +65,7 @@
                 <data android:mimeType="application/vnd.apple.pkpass" />
                 <data android:mimeType="application/vnd-com.apple.pkpass" />
                 <data android:mimeType="application/vnd.espass-espass" />
+                <data android:mimeType="application/vnd.apple.pkpasses" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -76,6 +77,7 @@
                 <data android:mimeType="application/vnd.apple.pkpass" />
                 <data android:mimeType="application/vnd-com.apple.pkpass" />
                 <data android:mimeType="application/vnd.espass-espass" />
+                <data android:mimeType="application/vnd.apple.pkpasses" />
             </intent-filter>
         </activity>
         <activity

app/src/main/java/protect/card_locker/ImportExportActivity.java

@@ -175,7 +175,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
 
         List<CharSequence> betaImportOptions = new ArrayList<>();
         betaImportOptions.add("Fidme");
-        betaImportOptions.add("Stocard");
         List<CharSequence> importOptions = new ArrayList<>();
 
         for (String importOption : getResources().getStringArray(R.array.import_types_array)) {
@@ -208,14 +207,8 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                             importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage);
                             importDataFormat = DataFormat.Catima;
                             break;
-                        // Stocard
-                        case 3:
-                            importAlertTitle = getString(R.string.importStocard);
-                            importAlertMessage = getString(R.string.importStocardMessage);
-                            importDataFormat = DataFormat.Stocard;
-                            break;
                         // Voucher Vault
-                        case 4:
+                        case 3:
                             importAlertTitle = getString(R.string.importVoucherVault);
                             importAlertMessage = getString(R.string.importVoucherVaultMessage);
                             importDataFormat = DataFormat.VoucherVault;

app/src/main/java/protect/card_locker/ListWidget.kt

@@ -101,7 +101,8 @@ class ListWidget : AppWidgetProvider() {
             setInt(R.id.item_container_foreground, "setBackgroundColor", headerColor)
             val icon = loyaltyCard.getImageThumbnail(context)
             // setImageViewIcon is not supported on Android 5, so force Android 5 down the text path
-            if (icon != null && Build.VERSION.SDK_INT >= 23) {
+            // FIXME: The icon flow causes a crash up to Android 12L, so SDK_INT is forced up from 23 to 33
+            if (icon != null && Build.VERSION.SDK_INT >= 32) {
                 setInt(R.id.item_container_foreground, "setBackgroundColor", foreground)
                 setImageViewIcon(R.id.item_image, Icon.createWithBitmap(icon))
                 setViewVisibility(R.id.item_text, View.INVISIBLE)

app/src/main/java/protect/card_locker/MainActivity.java

@@ -498,6 +498,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
                 // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
                 parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
+            } else if (receivedType.equals("application/vnd.apple.pkpasses")) {
+                parseResultList = Utils.retrieveBarcodesFromPkPasses(this, data);
             } else {
                 Log.e(TAG, "Wrong mime-type");
                 return;

app/src/main/java/protect/card_locker/PkpassesParser.kt

@@ -0,0 +1,73 @@
+package protect.card_locker
+
+import android.content.Context
+import android.net.Uri
+import android.util.Log
+import androidx.core.net.toUri
+import net.lingala.zip4j.io.inputstream.ZipInputStream
+import net.lingala.zip4j.model.LocalFileHeader
+import java.io.FileNotFoundException
+import java.io.IOException
+
+class PkpassesParser(context: Context, uri: Uri?) {
+    private var mContext = context
+    private val pkPassParsers: ArrayList<PkpassParser> = ArrayList()
+
+    init {
+        mContext = context
+
+        Log.i(TAG, "Received Pkpasses file")
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data")
+            throw IOException(context.getString(R.string.errorReadingFile))
+        }
+
+        try {
+            mContext.contentResolver.openInputStream(uri).use { inputStream ->
+                ZipInputStream(inputStream).use { zipInputStream ->
+                    var localFileHeader: LocalFileHeader?
+
+                    while (true) {
+                        // Retrieve the next file
+                        localFileHeader = zipInputStream.nextEntry
+
+                        // If no next file, exit loop
+                        if (localFileHeader == null) {
+                            break
+                        }
+
+                        // Ignore directories
+                        if (localFileHeader.isDirectory) continue
+
+                        // Ignore non-pkpass files
+                        if (!localFileHeader.fileName.endsWith(".pkpass")) continue
+
+                        // Extract .pkpass (.zip) inside .pkpasses to cache directory
+                        val tempFileName = "pkpassparser_" + System.currentTimeMillis() + "_" + localFileHeader.fileName
+                        val tempFile = Utils.copyToTempFile(mContext, zipInputStream, tempFileName)
+
+                        // Parse temporary file
+                        pkPassParsers.add(
+                            PkpassParser(mContext, tempFile.toUri())
+                        )
+
+                        // Delete temporary file
+                        tempFile.delete()
+                    }
+                }
+            }
+        } catch (e: FileNotFoundException) {
+            throw IOException(mContext.getString(R.string.errorReadingFile))
+        } catch (e: Exception) {
+            throw e
+        }
+    }
+
+    fun getPkpassParsers(): ArrayList<PkpassParser> {
+        return pkPassParsers
+    }
+
+    companion object {
+        private const val TAG = "Catima"
+    }
+}

app/src/main/java/protect/card_locker/Utils.java

@@ -87,10 +87,10 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.EnumMap;
 import java.util.GregorianCalendar;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -228,6 +228,58 @@ public class Utils {
         return parseResultList;
     }
 
+    static public List<ParseResult> retrieveBarcodesFromPkPasses(Context context, Uri uri) {
+        Log.i(TAG, "Received Pkpasses file with possible barcode");
+        if (uri == null) {
+            Log.e(TAG, "Pkpasses did not contain any data");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        PkpassesParser pkpassesParser;
+        try {
+            pkpassesParser = new PkpassesParser(context, uri);
+        } catch (Exception e) {
+            Log.e(TAG, "Error reading pkpasses file", e);
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        List<ParseResult> parseResultList = new ArrayList<>();
+        int i = 0;
+        for (PkpassParser pkpassParser : pkpassesParser.getPkpassParsers()) {
+            ParseResult parseResult;
+            List<String> locales = pkpassParser.listLocales();
+            if (locales.isEmpty()) {
+                try {
+                    parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(null));
+                } catch (Exception e) {
+                    Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                    Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                    return new ArrayList<>();
+                }
+                parseResult.setNote(String.format(context.getString(R.string.cardWithNumber), i+1));
+                parseResultList.add(parseResult);
+            } else {
+                for (String locale : locales) {
+                    try {
+                        parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(locale));
+                    } catch (Exception e) {
+                        Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                        Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                        return new ArrayList<>();
+                    }
+                    parseResult.setNote(String.format(context.getString(R.string.cardWithNumberAndLocale), i+1, locale));
+                    parseResultList.add(parseResult);
+                }
+            }
+
+            i++;
+        }
+
+        return parseResultList;
+    }
+
     static public List<ParseResult> retrieveBarcodesFromPdf(Context context, Uri uri) {
         Log.i(TAG, "Received PDF file with possible barcode");
         if (uri == null) {
@@ -319,7 +371,19 @@ public class Utils {
         }
 
         if (requestCode == Utils.BARCODE_IMPORT_FROM_PKPASS_FILE) {
-            return retrieveBarcodesFromPkPass(context, intent.getData());
+            Uri intentData = intent.getData();
+
+            if (intentData == null) {
+                Log.e(TAG, "Uri did not contain any data");
+                Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                return new ArrayList<>();
+            }
+
+            if (Objects.equals(context.getContentResolver().getType(intentData), "application/vnd.apple.pkpasses")) {
+                return retrieveBarcodesFromPkPasses(context, intentData);
+            }
+
+            return retrieveBarcodesFromPkPass(context, intentData);
         }
 
         if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
@@ -850,7 +914,7 @@ public class Utils {
 
     public static File copyToTempFile(Context context, InputStream input, String name) throws IOException {
         File file = createTempFile(context, name);
-        try (input; FileOutputStream out = new FileOutputStream(file)) {
+        try (FileOutputStream out = new FileOutputStream(file)) {
             byte[] buf = new byte[4096];
             int len;
             while ((len = input.read(buf)) != -1) {

app/src/main/java/protect/card_locker/importexport/DataFormat.java

@@ -3,6 +3,5 @@ package protect.card_locker.importexport;
 public enum DataFormat {
     Catima,
     Fidme,
-    Stocard,
     VoucherVault;
 }

app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java

@@ -37,9 +37,6 @@ public class MultiFormatImporter {
             case Fidme:
                 importer = new FidmeImporter();
                 break;
-            case Stocard:
-                importer = new StocardImporter();
-                break;
             case VoucherVault:
                 importer = new VoucherVaultImporter();
                 break;

app/src/main/java/protect/card_locker/importexport/StocardImporter.java

@@ -1,428 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import com.google.zxing.BarcodeFormat;
-
-import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.io.inputstream.ZipInputStream;
-import net.lingala.zip4j.model.FileHeader;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import protect.card_locker.CatimaBarcode;
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-import protect.card_locker.ImageLocationType;
-import protect.card_locker.LoyaltyCard;
-import protect.card_locker.R;
-import protect.card_locker.Utils;
-import protect.card_locker.ZipUtils;
-
-/**
- * Class for importing a database from CSV (Comma Separate Values)
- * formatted data.
- * <p>
- * The database's loyalty cards are expected to appear in the CSV data.
- * A header is expected for the each table showing the names of the columns.
- */
-public class StocardImporter implements Importer {
-    public static class StocardProvider {
-        public String name = null;
-        public String barcodeFormat = null;
-        public Bitmap logo = null;
-    }
-
-    public static class StocardRecord {
-        public String providerId = null;
-        public String store = null;
-        public String label = null;
-        public String note = null;
-        public String cardId = null;
-        public String barcodeType = null;
-        public Long lastUsed = null;
-        public Bitmap frontImage = null;
-        public Bitmap backImage = null;
-
-        @NonNull
-        @Override
-        public String toString() {
-            return String.format(
-                    "StocardRecord{%n  providerId=%s,%n  store=%s,%n  label=%s,%n  note=%s,%n  cardId=%s,%n"
-                            + "  barcodeType=%s,%n  lastUsed=%s,%n  frontImage=%s,%n  backImage=%s%n}",
-                    this.providerId,
-                    this.store,
-                    this.label,
-                    this.note,
-                    this.cardId,
-                    this.barcodeType,
-                    this.lastUsed,
-                    this.frontImage,
-                    this.backImage
-            );
-        }
-    }
-
-    public static class ZIPData {
-        public final Map<String, StocardRecord> cards;
-        public final Map<String, StocardProvider> providers;
-
-        ZIPData(final Map<String, StocardRecord> cards, final Map<String, StocardProvider> providers) {
-            this.cards = cards;
-            this.providers = providers;
-        }
-    }
-
-    public static class ImportedData {
-        public final List<LoyaltyCard> cards;
-        public final Map<Integer, Map<ImageLocationType, Bitmap>> images;
-
-        ImportedData(final List<LoyaltyCard> cards, final Map<Integer, Map<ImageLocationType, Bitmap>> images) {
-            this.cards = cards;
-            this.images = images;
-        }
-    }
-
-    public static final String PROVIDER_PREFIX = "/loyalty-card-providers/";
-
-    private static final String TAG = "Catima";
-
-    public void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        ZIPData zipData = new ZIPData(new HashMap<>(), new HashMap<>());
-
-        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.builder().setHeader().build());
-
-        try {
-            for (CSVRecord record : parser) {
-                StocardProvider provider = new StocardProvider();
-                provider.name = record.get("name").trim();
-                provider.barcodeFormat = record.get("barcodeFormat").trim();
-
-                zipData.providers.put(record.get("_id").trim(), provider);
-            }
-
-            parser.close();
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-
-        ZipFile zipFile = new ZipFile(inputFile, password);
-        zipData = importZIP(zipFile, zipData);
-        zipFile.close();
-
-        if (zipData.cards.keySet().size() == 0) {
-            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
-        }
-
-        ImportedData importedData = importLoyaltyCardHashMap(context, zipData);
-        saveAndDeduplicate(context, database, importedData);
-    }
-
-    public ZIPData importZIP(ZipFile zipFile, final ZIPData zipData) throws IOException, FormatException, JSONException {
-        Map<String, StocardRecord> cards = zipData.cards;
-        Map<String, StocardProvider> providers = zipData.providers;
-
-        String[] customProvidersBaseName = null;
-        String[] cardBaseName = null;
-        String customProviderId = "";
-        String cardName = "";
-        for (FileHeader fileHeader : zipFile.getFileHeaders()) {
-            String fileName = fileHeader.getFileName();
-            String[] nameParts = fileName.split("/");
-
-            if (nameParts.length < 2) {
-                continue;
-            }
-
-            String userId = nameParts[1];
-            ZipInputStream zipInputStream = zipFile.getInputStream(fileHeader);
-
-            if (customProvidersBaseName == null) {
-                // FIXME: can we use the points-account/statement/content.json balance info somehow?
-                /*
-                  Known files:
-                    extracts/<user-UUID>/users/<user-UUID>/
-                      analytics-properties/content.json
-                      devices/<device-UUID>/
-                        analytics-properties/content.json
-                        content.json
-                        ip-location-wifi/content.json
-                      enabled-regions/<UUID>/content.json
-                      loyalty-card-custom-providers/<provider-UUID>/content.json - custom providers
-                      loyalty-cards/<card-UUID>/
-                        card-linked-coupons/accounts/default/
-                          content.json
-                          user-coupons/<UUID>/content.json
-                        content.json - card itself
-                        images/back.png - back image (legacy)
-                        images/back/back.jpg - back image
-                        images/back/content.json
-                        images/front.png - front image (legacy)
-                        images/front/content.json
-                        images/front/front.jpg - front image
-                        notes/default/content.json - note
-                        points-account/
-                          content.json
-                          statement/content.json
-                        usages/<UUID>/content.json - timestamps
-                        usage-statistics/content.json - timestamps
-                      reward-program-balances/<UUID>/content.json
-                */
-                customProvidersBaseName = new String[]{
-                        "extracts",
-                        userId,
-                        "users",
-                        userId,
-                        "loyalty-card-custom-providers"
-                };
-                cardBaseName = new String[]{
-                        "extracts",
-                        userId,
-                        "users",
-                        userId,
-                        "loyalty-cards"
-                };
-            }
-
-            if (startsWith(nameParts, customProvidersBaseName, 1)) {
-                // Extract providerId
-                customProviderId = nameParts[customProvidersBaseName.length];
-
-                StocardProvider provider = providers.get(customProviderId);
-                if (provider == null) {
-                    provider = new StocardProvider();
-                    providers.put(customProviderId, provider);
-                }
-
-                // Name file
-                if (fileName.endsWith(customProviderId + "/content.json")) {
-                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
-                    provider.name = jsonObject.getString("name");
-                } else if (fileName.endsWith("logo.png")) {
-                    provider.logo = ZipUtils.readImage(zipInputStream);
-                } else if (!fileName.endsWith("/")) {
-                    Log.d(TAG, "Unknown or unused loyalty-card-custom-providers file " + fileName + ", skipping...");
-                }
-            } else if (startsWith(nameParts, cardBaseName, 1)) {
-                // Extract cardName
-                cardName = nameParts[cardBaseName.length];
-
-                StocardRecord record = cards.get(cardName);
-                if (record == null) {
-                    record = new StocardRecord();
-                    cards.put(cardName, record);
-                }
-
-                // This is the card itself
-                if (fileName.endsWith(cardName + "/content.json")) {
-                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
-                    record.cardId = jsonObject.getString("input_id");
-
-                    if (jsonObject.has("input_provider_name")) {
-                        record.store = jsonObject.getString("input_provider_name");
-                    }
-
-                    if (jsonObject.has("label")) {
-                        String label = jsonObject.getString("label");
-                        if (!label.isBlank()) {
-                            record.label = label;
-                        }
-                    }
-
-                    // Provider ID can be either custom or not, extract whatever version is relevant
-                    String customProviderPrefix = "/users/" + userId + "/loyalty-card-custom-providers/";
-                    String providerId = jsonObject
-                            .getJSONObject("input_provider_reference")
-                            .getString("identifier");
-                    if (providerId.startsWith(customProviderPrefix)) {
-                        providerId = providerId.substring(customProviderPrefix.length());
-                    } else if (providerId.startsWith(PROVIDER_PREFIX)) {
-                        providerId = providerId.substring(PROVIDER_PREFIX.length());
-                    } else {
-                        throw new FormatException("Unsupported provider ID format: " + providerId);
-                    }
-
-                    record.providerId = providerId;
-
-                    if (jsonObject.has("input_barcode_format")) {
-                        record.barcodeType = jsonObject.getString("input_barcode_format");
-                    }
-                } else if (fileName.endsWith("notes/default/content.json")) {
-                    record.note = ZipUtils.readJSON(zipInputStream).getString("content");
-                } else if (fileName.endsWith("usage-statistics/content.json")) {
-                    JSONArray usages = ZipUtils.readJSON(zipInputStream).getJSONArray("usages");
-                    for (int i = 0; i < usages.length(); i++) {
-                        JSONObject lastUsedObject = usages.getJSONObject(i);
-                        String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
-                        long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
-                        if (record.lastUsed == null || timeStamp > record.lastUsed) {
-                            record.lastUsed = timeStamp;
-                        }
-                    }
-                } else if (fileName.matches(".*/usages/[^/]+/content.json")) {
-                    JSONObject lastUsedObject = ZipUtils.readJSON(zipInputStream);
-                    String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
-                    long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
-                    if (record.lastUsed == null || timeStamp > record.lastUsed) {
-                        record.lastUsed = timeStamp;
-                    }
-                } else if (fileName.endsWith("/images/front.png") || fileName.endsWith("/images/front/front.jpg")) {
-                    record.frontImage = ZipUtils.readImage(zipInputStream);
-                } else if (fileName.endsWith("/images/back.png") || fileName.endsWith("/images/back/back.jpg")) {
-                    record.backImage = ZipUtils.readImage(zipInputStream);
-                } else if (!fileName.endsWith("/")) {
-                    Log.d(TAG, "Unknown or unused loyalty-cards file " + fileName + ", skipping...");
-                }
-            } else if (!fileName.endsWith("/")) {
-                Log.d(TAG, "Unknown or unused file " + fileName + ", skipping...");
-            }
-
-            zipInputStream.close();
-        }
-
-        return new ZIPData(cards, providers);
-    }
-
-    public ImportedData importLoyaltyCardHashMap(Context context, final ZIPData zipData) throws FormatException {
-        ImportedData importedData = new ImportedData(new ArrayList<>(), new HashMap<>());
-        int tempID = 0;
-
-        List<String> cardKeys = new ArrayList<>(zipData.cards.keySet());
-        Collections.sort(cardKeys);
-
-        for (String key : cardKeys) {
-            StocardRecord record = zipData.cards.get(key);
-
-            if (record.providerId == null) {
-                Log.d(TAG, "Missing providerId for card " + record + ", ignoring...");
-                continue;
-            }
-
-            if (record.cardId == null) {
-                throw new FormatException("No card ID listed, but is required");
-            }
-
-            StocardProvider provider = zipData.providers.get(record.providerId);
-
-            // Read store from card, if not available (old export), fall back to providerData
-            String store = record.store != null ? record.store : provider != null ? provider.name : record.providerId;
-            String note = record.note != null ? record.note : "";
-            String barcodeTypeString = record.barcodeType != null ? record.barcodeType : provider != null ? provider.barcodeFormat : null;
-
-            if (record.label != null && !record.label.equals(store) && !record.label.equals(note)) {
-                note = note.isEmpty() ? record.label : note + "\n" + record.label;
-            }
-
-            CatimaBarcode barcodeType = null;
-            if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
-                if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
-                } else if (barcodeTypeString.equals("GS1_128")) {
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
-                } else {
-                    barcodeType = CatimaBarcode.fromName(barcodeTypeString);
-                }
-            }
-
-            int headerColor = Utils.getRandomHeaderColor(context);
-            if (provider != null && provider.logo != null) {
-                headerColor = Utils.getHeaderColorFromImage(provider.logo, headerColor);
-            }
-
-            long lastUsed = record.lastUsed != null ? record.lastUsed : Utils.getUnixTime();
-
-            LoyaltyCard card = new LoyaltyCard(
-                    tempID,
-                    store,
-                    note,
-                    null,
-                    null,
-                    BigDecimal.valueOf(0),
-                    null,
-                    record.cardId,
-                    null,
-                    barcodeType,
-                    headerColor,
-                    0,
-                    lastUsed,
-                    DBHelper.DEFAULT_ZOOM_LEVEL,
-                    DBHelper.DEFAULT_ZOOM_LEVEL_WIDTH,
-                    0,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null
-            );
-            importedData.cards.add(card);
-
-            Map<ImageLocationType, Bitmap> images = new HashMap<>();
-
-            if (provider != null && provider.logo != null) {
-                images.put(ImageLocationType.icon, provider.logo);
-            }
-            if (record.frontImage != null) {
-                images.put(ImageLocationType.front, record.frontImage);
-            }
-            if (record.backImage != null) {
-                images.put(ImageLocationType.back, record.backImage);
-            }
-
-            importedData.images.put(tempID, images);
-            tempID++;
-        }
-
-        return importedData;
-    }
-
-    public void saveAndDeduplicate(Context context, SQLiteDatabase database, final ImportedData data) throws IOException {
-        // This format does not have IDs that can cause conflicts
-        // Proper deduplication for all formats will be implemented later
-        for (LoyaltyCard card : data.cards) {
-            // card.id is temporary and only used to index the images Map
-            long id = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-            for (Map.Entry<ImageLocationType, Bitmap> entry : data.images.get(card.id).entrySet()) {
-                Utils.saveCardImage(context, entry.getValue(), (int) id, entry.getKey());
-            }
-        }
-    }
-
-    private boolean startsWith(String[] full, String[] start, int minExtraLength) {
-        if (full.length - minExtraLength < start.length) {
-            return false;
-        }
-
-        for (int i = 0; i < start.length; i++) {
-            if (!start[i].contentEquals(full[i])) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}

app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z"
+      android:fillColor="#1F4262"/>
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -3,69 +3,57 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="1.5307087"
-      android:scaleY="1.5307087"
-      android:translateX="15.12"
-      android:translateY="15.12">
+  <group android:scaleX="0.75"
+      android:scaleY="0.75"
+      android:translateX="13.5"
+      android:translateY="13.5">
     <path
-        android:pathData="M14.3354,20.1954l20.7318,-9.2304l5.7612,12.9398l-20.7318,9.2304z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#f0f0f0"
-        android:strokeColor="#c80000"/>
+        android:pathData="M45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28L49.6,41.85L45.5,30.58Z"
+        android:fillColor="#F5A3A3"/>
     <path
-        android:pathData="M14.8755,10.9648l23.2041,10.3311l-6.8874,15.4694l-23.2041,-10.3311z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#f0f0f0"
-        android:strokeColor="#c80000"/>
+        android:pathData="M70.36,25.78C70.17,25.27 69.6,25 69.08,25.19L49.35,32.37L51.4,38.01L72.07,30.48L70.36,25.78ZM75.92,32.28L49.6,41.85L45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28Z"
+        android:fillColor="#CF1717"/>
     <path
-        android:pathData="M16.5599,16.1348l26.5459,7.6119l-4.5489,15.8639l-26.5459,-7.6119z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="1.5875"
-        android:fillColor="#c80000"
-        android:strokeColor="#c80000"
-        android:fillType="evenOdd"/>
+        android:pathData="M58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28L54.31,41.85L58.42,30.58Z"
+        android:fillColor="#F5A3A3"/>
     <path
-        android:pathData="M12.011,15.4955h27.6157v16.5032h-27.6157z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="1.5875"
-        android:fillColor="#ff0000"
-        android:strokeColor="#ff0000"
-        android:fillType="evenOdd"/>
+        android:pathData="M33.56,25.78C33.74,25.27 34.32,25 34.84,25.19L54.57,32.37L52.52,38.01L31.84,30.48L33.56,25.78ZM28,32.28L54.31,41.85L58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28Z"
+        android:fillColor="#DD1818"/>
     <path
-        android:pathData="M7.8471,23.7471a4.3659,8.5899 0,1 0,8.7317 0a4.3659,8.5899 0,1 0,-8.7317 0z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="0.91078"
-        android:fillColor="#ff0000"
-        android:strokeColor="#ff0000"/>
+        android:pathData="M28.7,37.6C29.08,35.42 31.15,33.97 33.33,34.35L80.6,42.69C82.78,43.07 84.23,45.15 83.85,47.32L81.82,58.83C82.3,59.1 84.67,60.16 87.42,57.23V57.23C87.92,56.69 88.45,56.23 89.01,55.86C91.76,54.02 94,55.22 94,58.53C94,61.34 92.39,64.78 90.21,66.88C86.63,70.54 80.69,70.56 79.75,70.53L77.59,82.78C77.21,84.95 75.14,86.4 72.96,86.02L25.69,77.69C25.67,77.68 25.66,77.68 25.64,77.68C23.45,77.32 22,76.7 22,76C22,75.72 22.23,75.45 22.66,75.2C22.4,74.54 22.31,73.8 22.44,73.05L28.7,37.6Z"
+        android:fillColor="#B81414"/>
     <path
-        android:pathData="m24.4983,25.781a1.6711,1.6711 0,0 1,-1.3809 1.6457,1.6711 1.6711,0 0,1 -1.8605,-1.0741"
-        android:strokeLineJoin="round"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="round"/>
+        android:pathData="M90.67,60.75C90.67,61.85 89.93,63.24 89.01,63.86C88.09,64.47 87.34,64.07 87.34,62.97C87.34,61.86 88.09,60.47 89.01,59.86C89.93,59.24 90.67,59.64 90.67,60.75Z"
+        android:fillColor="#E82E2E"/>
     <path
-        android:pathData="m27.7991,26.333a1.6711,1.6711 0,0 1,-1.8605 1.0741,1.6711 1.6711,0 0,1 -1.3809,-1.6457"
-        android:strokeLineJoin="round"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="round"/>
+        android:pathData="M78,30C80.21,30 82,31.79 82,34V70C82,72.21 80.21,74 78,74H30C25.58,74 22,74.9 22,76V32C22,30.9 25.58,30 30,30H78Z"
+        android:fillColor="#E82E2E"/>
     <path
-        android:pathData="m16.0606,22.271 l2.6458,-2.6458 2.6458,2.6458"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="butt"/>
+        android:pathData="M51.2,54.25C51.62,53.53 52.53,53.29 53.25,53.7C53.94,54.1 54.2,54.98 53.84,55.68L53.76,55.82C53.4,56.52 53.65,57.4 54.35,57.8C55.04,58.2 55.93,57.98 56.36,57.32L56.44,57.18C56.87,56.52 57.75,56.3 58.45,56.7C59.16,57.12 59.41,58.03 58.99,58.75C57.75,60.9 55,61.64 52.85,60.4C50.7,59.15 49.96,56.4 51.2,54.25Z"
+        android:fillColor="#8A0F0F"/>
     <path
-        android:pathData="m27.7023,22.271 l2.6458,-2.6458 2.6458,2.6458"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="butt"/>
+        android:pathData="M52.79,54.25C52.38,53.53 51.46,53.29 50.75,53.7C50.05,54.1 49.8,54.98 50.16,55.68L50.23,55.82C50.6,56.52 50.34,57.4 49.65,57.8C48.95,58.2 48.07,57.98 47.64,57.32L47.56,57.18C47.13,56.52 46.24,56.3 45.55,56.7C44.83,57.12 44.59,58.03 45,58.75C46.24,60.9 49,61.64 51.15,60.4C53.3,59.15 54.04,56.4 52.79,54.25Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M53.3,56.75C52.72,57.75 51.28,57.75 50.7,56.75L48.1,52.25C47.53,51.25 48.25,50 49.4,50L54.6,50C55.75,50 56.47,51.25 55.9,52.25L53.3,56.75Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M40.5,40.5C43.73,40.5 46.46,42.62 47.42,45.53C47.68,46.31 47.26,47.16 46.47,47.42C45.69,47.68 44.84,47.26 44.58,46.47C44,44.73 42.38,43.5 40.5,43.5C38.62,43.5 37,44.73 36.42,46.47C36.16,47.26 35.31,47.68 34.53,47.42C33.74,47.16 33.32,46.31 33.58,45.53C34.54,42.62 37.27,40.5 40.5,40.5Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M63.5,40.5C66.73,40.5 69.46,42.62 70.42,45.53C70.68,46.31 70.26,47.16 69.47,47.42C68.69,47.68 67.84,47.26 67.58,46.47C67,44.73 65.38,43.5 63.5,43.5C61.62,43.5 60,44.73 59.42,46.47C59.16,47.26 58.31,47.68 57.53,47.42C56.74,47.16 56.32,46.31 56.58,45.53C57.54,42.62 60.27,40.5 63.5,40.5Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M26,55C25.45,55 25,54.55 25,54C25,53.45 25.45,53 26,53H42C42.55,53 43,53.45 43,54C43,54.55 42.55,55 42,55H26Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M26.35,60.94C25.83,61.13 25.26,60.87 25.06,60.35C24.87,59.83 25.13,59.26 25.65,59.06L41.65,53.06C42.17,52.87 42.74,53.13 42.94,53.65C43.13,54.17 42.87,54.74 42.35,54.94L26.35,60.94Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M61.65,54.94C61.13,54.74 60.87,54.17 61.06,53.65C61.26,53.13 61.83,52.87 62.35,53.06L78.35,59.06C78.87,59.26 79.13,59.83 78.94,60.35C78.74,60.87 78.17,61.13 77.65,60.94L61.65,54.94Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M78,55C78.55,55 79,54.55 79,54C79,53.45 78.55,53 78,53H62C61.45,53 61,53.45 61,54C61,54.55 61.45,55 62,55H78Z"
+        android:fillColor="#8A0F0F"/>
   </group>
 </vector>

app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -3,25 +3,34 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M53.26,40.92l14.35,-6.39l2.86,6.42"
-      android:strokeAlpha="0.4"
-      android:fillAlpha="0.4"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M36.14,40.95l2.86,-6.42l14.24,6.34"
-      android:strokeAlpha="0.4"
-      android:fillAlpha="0.4"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M40.01,37.17l7.73,3.44H38.48l1.53,-3.44m26.58,0 l1.53,3.44H58.86l7.73,-3.44M39,34.53l-2.86,6.42v1.66H70.47V40.95L67.61,34.53 53.27,40.92l-0.02,-0.05L39,34.53Z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M74.07,51.23l4.93,1.41l-6.44,22.48l-37.61,-10.79l39.13,0l0,-13.11z"
-      android:strokeAlpha="0.7"
-      android:fillAlpha="0.7"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M34.94,40.95C31.66,40.95 29,46.19 29,52.64s2.66,11.69 5.94,11.69L74.07,64.34L74.07,40.95ZM41.21,51.08 L40.15,50.02 44.43,45.74 48.71,50.02 47.65,51.08 44.43,47.86ZM58.02,56.56a3.11,3.11 0,0 1,-2.93 2.05,3.15 3.15,0 0,1 -0.55,-0.05 3.11,3.11 0,0 1,-1.83 -1.04,3.12 3.12,0 0,1 -5.3,-0.96 0.75,0.75 0,0 1,1.41 -0.51,1.62 1.62,0 0,0 3.14,-0.55 0.75,0.75 0,0 1,1.5 0,1.62 1.62,0 0,0 3.14,0.55 0.75,0.75 0,0 1,1.41 0.51ZM64.14,51.08 L60.92,47.86L57.71,51.08l-1.06,-1.06 4.28,-4.28 4.28,4.28Z"/>
+  <group android:scaleX="0.75"
+      android:scaleY="0.75"
+      android:translateX="13.5"
+      android:translateY="13.5">
+    <path
+        android:pathData="M75,31C78.31,31 81,33.69 81,37V44.43C81.83,45.67 82.2,47.22 81.92,48.81L81,54.01V55.87C81.24,55.72 81.5,55.51 81.79,55.22L81.86,55.14C82.38,54.59 82.96,54.08 83.58,53.67L83.72,53.57C85.2,52.64 87.03,52.17 88.68,53.05C90.37,53.96 90.99,55.83 90.99,57.63L90.99,57.77C90.94,60.78 89.29,64.16 87.12,66.26L87.12,66.26C85.22,68.18 82.74,69.08 80.76,69.52C80.64,69.55 80.53,69.57 80.41,69.6C79.85,70.76 78.92,71.72 77.77,72.32L76.71,78.35C76.13,81.61 73.02,83.79 69.76,83.22L30.37,76.27C30.33,76.27 30.29,76.26 30.26,76.25C29.12,76.09 28.06,75.84 27.22,75.49C26.8,75.32 26.33,75.07 25.93,74.72C25.54,74.37 25.01,73.72 25,72.78C25,72.78 25,72.78 25,72.78C25,72.77 25,72.76 25,72.75V34.5C25,33.84 25.32,33.25 25.82,32.89C26.23,32.49 26.7,32.24 27.04,32.09C27.6,31.83 28.27,31.63 28.97,31.48C29.75,31.31 30.64,31.18 31.59,31.1C31.59,31.1 31.58,31.1 31.57,31.1L32.67,28.07L32.73,27.93C33.91,24.91 37.3,23.37 40.36,24.49L52.83,29.03L65.3,24.49C68.42,23.36 71.86,24.96 73,28.07L74.06,31H75ZM34.85,73L70.45,79.28C71.54,79.47 72.58,78.74 72.77,77.66L73.59,73H34.85ZM34,35C32.35,35 30.88,35.15 29.82,35.39C29.48,35.46 29.21,35.54 29,35.61V69.47C30.4,69.17 32.15,69 34,69H75L75.1,69C76.13,68.95 76.95,68.13 77,67.1L77,67V37C77,35.9 76.1,35 75,35H34ZM86.78,56.59C86.68,56.59 86.4,56.61 85.88,56.94L85.8,56.99C85.47,57.21 85.13,57.51 84.78,57.88C84.78,57.88 84.78,57.88 84.78,57.88L84.64,58.03C83.44,59.25 82.18,59.88 81,60.12V65.32C82.2,64.94 83.35,64.36 84.22,63.5L84.34,63.38C85.88,61.89 86.99,59.43 86.99,57.63L86.99,57.53C86.98,56.92 86.84,56.67 86.78,56.59ZM46.56,31L38.99,28.25C37.99,27.88 36.88,28.37 36.47,29.35L36.43,29.44L35.86,31H46.56ZM69.8,31L69.24,29.44C68.86,28.41 67.71,27.87 66.67,28.25L59.11,31H69.8Z"
+        android:fillColor="#000000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M55.17,51C56.32,51 57.04,52.25 56.46,53.25L54.69,56.31C54.6,56.76 54.79,57.24 55.21,57.48C55.73,57.78 56.39,57.6 56.69,57.08C57.11,56.37 58.02,56.12 58.74,56.53C59.46,56.95 59.7,57.87 59.29,58.58C58.16,60.54 55.67,61.21 53.71,60.08C53.45,59.93 53.21,59.75 53,59.55C52.78,59.75 52.54,59.93 52.28,60.08C50.33,61.21 47.83,60.54 46.7,58.58C46.29,57.87 46.53,56.95 47.25,56.53C47.97,56.12 48.88,56.37 49.3,57.08C49.6,57.6 50.26,57.78 50.78,57.48C51.2,57.23 51.4,56.74 51.29,56.29L49.54,53.25C48.96,52.25 49.68,51 50.83,51H55.17Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M43.25,42.5C46,42.5 48.48,44.07 49.4,46.46C49.7,47.24 49.31,48.1 48.54,48.4C47.76,48.7 46.9,48.31 46.6,47.54C46.18,46.44 44.91,45.5 43.25,45.5C41.58,45.5 40.32,46.44 39.9,47.54C39.6,48.31 38.74,48.7 37.96,48.4C37.19,48.1 36.8,47.24 37.1,46.46C38.02,44.07 40.5,42.5 43.25,42.5Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M62.75,42.5C65.5,42.5 67.98,44.07 68.9,46.46C69.2,47.24 68.81,48.1 68.04,48.4C67.26,48.7 66.4,48.31 66.1,47.54C65.68,46.44 64.41,45.5 62.75,45.5C61.08,45.5 59.82,46.44 59.4,47.54C59.1,48.31 58.24,48.7 57.46,48.4C56.69,48.1 56.3,47.24 56.6,46.46C57.52,44.07 60,42.5 62.75,42.5Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M33,55C32.17,55 31.5,54.33 31.5,53.5C31.5,52.67 32.17,52 33,52H44.25C45.08,52 45.75,52.67 45.75,53.5C45.75,54.33 45.08,55 44.25,55H33Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M33.61,59.87C32.85,60.21 31.97,59.87 31.63,59.11C31.29,58.35 31.63,57.47 32.39,57.13L43.61,52.13C44.37,51.79 45.26,52.13 45.59,52.89C45.93,53.65 45.59,54.53 44.83,54.87L33.61,59.87Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M60.85,54.88C60.09,54.55 59.74,53.66 60.07,52.9C60.4,52.14 61.28,51.79 62.04,52.12L73.6,57.12C74.36,57.45 74.71,58.34 74.38,59.1C74.05,59.86 73.16,60.21 72.4,59.88L60.85,54.88Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M73,52C73.83,52 74.5,52.67 74.5,53.5C74.5,54.33 73.83,55 73,55H61.5C60.67,55 60,54.33 60,53.5C60,52.67 60.67,52 61.5,52H73Z"
+        android:fillColor="#000000"/>
+  </group>
 </vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/raw/contributors.txt

@@ -15,51 +15,51 @@ IllusiveMan196
 Altonss
 B o d o
 Michael Moroni
+Silvério Santos
 Eric
 Joel A
-Silvério Santos
 Максим Горпиніч
 GM
 Priit Jõerüüt
-laralem
 Petr Novák
+laralem
 Edgars Andersons
 Taco
 nadiafekihahmed
 pfaffenrodt
 Aayush Gupta
 Scrambled777
-ikanakova
 Giovanni Donisi
+ikanakova
 HudobniVolk
-Jiri Grönroos
 Nyatsuki
+Jiri Grönroos
 josé m
 Samantaz Fox
+Fjuro
 Balázs Meskó
 Milo Ivir
-Fjuro
-Cliff Heraldo
 Sergio Paredes
+Cliff Heraldo
 Ankit Tiwari
 Arno-github
 Warder
+GitSpoon
 Kachelkaiser
 Jose Delvani
 mdvhimself
 Milan Šalka
-GitSpoon
-Skrripy
-Vasilis
-huuhaa
-தமிழ் நேரம்
-waffshappen
-Marnick L'Eau
-ngocanhtve
-StellarSand
-Quentin PAGÈS
-Projjal Moitra
 Robin
+தமிழ் நேரம்
+huuhaa
+Vasilis
+Skrripy
+Projjal Moitra
+Quentin PAGÈS
+StellarSand
+ngocanhtve
+Marnick L'Eau
+waffshappen
 JungHee Lee
 hajertabbane
 Ziad OUALHADJ

app/src/main/res/values-ar/strings.xml

@@ -77,8 +77,6 @@
     <string name="importCatimaMessage">حدّد ملفك <i>catima.zip</i> تصدير من Catima للاستيراد. \nإنشئها من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير هناك أولاً.</string>
     <string name="importFidme">الاستيراد من FidMe</string>
     <string name="importFidmeMessage">حدّد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد، ثم حدد أنواع الباركود يدويًا بعد ذلك. \nإنشئها من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
-    <string name="importStocardMessage">حدد ملفك <i>***.zip</i> تصدير من Stocard للاستيراد.
-\nاحصل عليه عن طريق إرسال بريد إلكتروني إلى support@stocardapp.com لطلب تصدير بياناتك.</string>
     <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
     <string name="importVoucherVaultMessage">حدّد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد. \nإنشئها بالضغط على تصدير في Voucher Vault أولاً.</string>
     <string name="barcodeId">قيمة الباركود</string>
@@ -229,7 +227,6 @@
     <string name="sort_by_expiry">انقضاء</string>
     <string name="importLoyaltyCardKeychain">الاستيراد من Loyalty Card Keychain</string>
     <string name="importLoyaltyCardKeychainMessage">حدّد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد. \nإنشئها من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
-    <string name="importStocard">الاستيراد من Stocard</string>
     <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة. الرجاء الإبلاغ عن هذا.</string>
     <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
     <string name="on_google_play">على Google Play</string>

app/src/main/res/values-be/strings.xml

@@ -139,7 +139,6 @@
     <string name="importCatima">Імпарт з Catima</string>
     <string name="importFidme">Імпарт з FidMe</string>
     <string name="importLoyaltyCardKeychain">Імпарт з Loyalty Card Keychain</string>
-    <string name="importStocard">Імпарт з Stocard</string>
     <string name="importVoucherVault">Імпарт з Voucher Vault</string>
     <string name="barcodeId">Значэнне штрыхкода</string>
     <string name="importVoucherVaultMessage">Каб імпартаваць, выберыце файл <i>vouchervault.json</i> з Voucher Vault. \nСтварыце яго, націснуўшы Экспарт у Voucher Vault .</string>
@@ -277,7 +276,6 @@
     <string name="editBarcode">Рэдагаваць штрыхкод</string>
     <string name="leaveWithoutSaveConfirmation">Выйсці без захавання?</string>
     <string name="importLoyaltyCardKeychainMessage">Каб імпартаваць, выберыце файл <i>LoyaltyCardKeychain.csv</i> з Loyalty Card Keychain. \nСтварыце яго з меню «Імпарт/Экспарт» у Loyalty Card Keychain, спачатку націснуўшы там «Экспарт».</string>
-    <string name="importStocardMessage">Каб імпартаваць, выберыце файл <i>***.zip</i> з Stocard. \nАтрымайце яго па электроннай пошце support@stocardapp.com з запытам на экспарт вашых даных.</string>
     <string name="frontImageDescription">Пярэдні відарыс</string>
     <string name="groupsList">Групы: <xliff:g>%s</xliff:g></string>
     <string name="switchToBackImage">Пераключыцца на задні відарыс</string>

app/src/main/res/values-bg/strings.xml

@@ -129,12 +129,9 @@
     <string name="addManually">Ръчно въвеждане</string>
     <string name="leaveWithoutSaveConfirmation">Оставяте промените незапазени\?</string>
     <string name="unsupportedBarcodeType">Щрихкод от този вид не може да бъде показан. Може да бъде поддържан в следващо издание.</string>
-    <string name="importStocard">Внасяне от Stocard</string>
     <string name="importVoucherVault">Внасяне от Voucher Vault</string>
     <string name="importVoucherVaultMessage">Изберете файла <i>vouchervault.json</i>, предварително изнесен от Voucher Vault.
 \nСъздайте такъв файл от меню „Export“ във Voucher Vault.</string>
-    <string name="importStocardMessage">Изберете файла <i>***.zip</i>, предварително изнесен от Stocard.
-\nПолучете го като изпратите писмо на support@stocardapp.com с искане за изнасяне вашите данни.</string>
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
     <string name="failedParsingImportUriError">Препратката не може да бъде анализирана за внасяне</string>
@@ -303,11 +300,13 @@
     <string name="settings_column_count_portrait">Колони в портретен изглед</string>
     <string name="settings_category_title_cards_overview">Списък с карти</string>
     <string name="generic_error_please_retry">Съжаляваме, нещо се обърка, опитайте отново…</string>
-    <string name="addFromPkpass">Изберете файл на Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Изберете файл на Passbook (.pkpass / pkpasses)</string>
     <string name="unsupportedFile">Този вид файлове не се поддържат</string>
     <string name="sort_by_valid_from">Начало валидност</string>
     <string name="width">Ширина</string>
     <string name="setBarcodeWidth">Задаване ширина на щрих кода</string>
     <string name="card_list_widget_name">Списък с карти</string>
     <string name="card_list_widget_empty">Когато добавите карти в Catima те ще се покажат тук. Ако имате карти уверете се, че са извън архива.</string>
+    <string name="cardWithNumber">Карта <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Карта <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-bn-rIN/strings.xml

@@ -26,7 +26,6 @@
     <string name="starImage">তারা ছবি</string>
     <string name="importCatima">ক্যাতিনা আগম</string>
     <string name="importLoyaltyCardKeychain">আমদানি লয়্যালটি কার্ড কীচেন</string>
-    <string name="importStocard">স্টো কার্ড আমদানি করুন</string>
     <string name="importVoucherVault">আমদানি ভাউচার ভল্ট</string>
     <string name="barcodeId">বারকোড আইডি</string>
     <string name="sameAsCardId">আইডি আর এটা এক</string>
@@ -203,8 +202,6 @@
 \nআপনার FidMe প্রোফাইল থেকে ডেটা সুরক্ষা নির্বাচন করে এবং তারপর প্রথমে আমার ডেটা বের করুন টিপে এটি তৈরি করুন।</string>
     <string name="importCatimaMessage">ক্যাটিমা থেকে আমদানি করতে আপনার <i>catima.zip</i> রপ্তানি নির্বাচন করুন।
 \nঅন্য Catima অ্যাপের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
-    <string name="importStocardMessage">আমদানি করতে Stocard থেকে আপনার <i>***.zip</i> এক্সপোর্ট নির্বাচন করুন।
-\nআপনার ডেটা রপ্তানির জন্য জিজ্ঞাসা করে support@stocardapp.com ই-মেইল করে এটি পান।</string>
     <string name="importVoucherVaultMessage">আমদানি করতে ভাউচার ভল্ট থেকে আপনার <i>vouchervault.json</i> এক্সপোর্ট নির্বাচন করুন।
 \nপ্রথমে ভাউচার ভল্টে এক্সপোর্ট টিপে এটি তৈরি করুন।</string>
     <string name="settings_oled_dark">অন্ধকার থিমের জন্য খাঁটি কালো পটভূমি</string>

app/src/main/res/values-bs/strings.xml

@@ -26,7 +26,6 @@
     <string name="starImage">Omiljena zvijezda</string>
     <string name="importCatima">Uvezi iz Catima</string>
     <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
-    <string name="importStocard">Uvezi iz Stokarda</string>
     <string name="importVoucherVault">Uvezi iz trezora vaučer</string>
     <string name="barcodeId">Barcode vrijednost</string>
     <string name="sameAsCardId">Isto kao i kartica</string>

app/src/main/res/values-cs/strings.xml

@@ -118,9 +118,6 @@
     <string name="importVoucherVaultMessage">Vyberte k importu svůj <i>vouchervault.json</i> exportovaný z Voucher Vault.
 \nVytvoříte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
     <string name="importVoucherVault">Import z Voucher Vault</string>
-    <string name="importStocardMessage">Vyberte k importu svůj <i>***.zip</i> exportovaný z aplikace Stocard.
-\nZískejte ji zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
-    <string name="importStocard">Import ze Stocard</string>
     <string name="importLoyaltyCardKeychainMessage">Vyberte k importu <i>LoyaltyCardKeychain.csv</i> exportovaný z Loyalty Card Keychain.
 \nVytvoříte jej z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
     <string name="importLoyaltyCardKeychain">Import z Loyalty Card Keychain</string>
@@ -300,7 +297,7 @@
     <string name="generic_error_please_retry">Je nám líto, něco se pokazilo, zkuste to prosím znovu...</string>
     <string name="settings_column_count_portrait">Sloupce v režimu na výšku</string>
     <string name="settings_automatic_column_count">Automatický</string>
-    <string name="addFromPkpass">Vyberte soubor Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Vyberte soubor Passbook (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">Tento soubor není podporován</string>
     <string name="settings_category_title_cards_overview">Přehled karet</string>
     <string name="settings_column_count_landscape">Sloupce v režimu na šířku</string>
@@ -316,4 +313,6 @@
     <string name="width">Šířka</string>
     <string name="card_list_widget_name">Seznam karet</string>
     <string name="card_list_widget_empty">Karty přidané do aplikace Catima se zobrazí zde. Pokud máte karty, ujistěte se, že nejsou všechny archivovány.</string>
+    <string name="cardWithNumber">Karta <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Karta <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -114,7 +114,6 @@
     <string name="never">Aldrig</string>
     <string name="chooseExpiryDate">Vælg udløbsdato</string>
     <string name="balance">Balance</string>
-    <string name="importStocard">Importer fra Stocard</string>
     <string name="balanceSentence">Balance: <xliff:g>%s</xliff:g></string>
     <string name="group_name_is_empty">Gruppenavn må ikke være tom</string>
     <string name="group_updated">Gruppe opdateret</string>

app/src/main/res/values-de/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="action_search">Suchen</string>
+    <string name="action_search">Suche</string>
     <string name="action_add">Hinzufügen</string>
     <string name="noGiftCards">Füge eine Karte mit + hinzu oder importiere welche über das ⋮ Menü.</string>
     <string name="noMatchingGiftCards">Keine Ergebnisse. Versuche, deine Suche zu ändern.</string>
@@ -126,8 +126,6 @@
     <string name="frontImageDescription">Vorderseite</string>
     <string name="backImageDescription">Rückseite</string>
     <string name="passwordRequired">Bitte gib das Passwort ein</string>
-    <string name="importStocardMessage">Wähle deinen <i>***.zip</i>-Export aus Stocard zum Importieren aus. \nDu erhälst ihn, indem du eine E-Mail an support@stocardapp.com sendest und um einen Export deiner Daten bittest.</string>
-    <string name="importStocard">Von Stocard importieren</string>
     <string name="turn_flashlight_off">Blitzlicht ausschalten</string>
     <string name="turn_flashlight_on">Blitzlicht einschalten</string>
     <string name="failedGeneratingShareURL">URL konnte nicht erstellt werden. Bitte melde das an uns.</string>
@@ -300,10 +298,12 @@
     <string name="settings_column_count_6">6</string>
     <string name="generic_error_please_retry">Entschuldigung, da ist etwas schief gelaufen, versuchen Sie es noch einmal ...</string>
     <string name="unsupportedFile">Diese Datei wird nicht unterstützt</string>
-    <string name="addFromPkpass">Passbook-Datei (.pkpass) auswählen</string>
+    <string name="addFromPkpass">Eine Passbook-Datei (.pkpass / .pkpasses) auswählen</string>
     <string name="sort_by_valid_from">Gültig ab</string>
     <string name="width">Breite</string>
     <string name="setBarcodeWidth">Barcodebreite einstellen</string>
-    <string name="card_list_widget_empty">Nachdem du einige Treuekarten in Catima hinzugefügt hast, werden sie hier angezeigt. Wenn du Karten hast, stelle sicher, dass sie nicht alle archiviert sind.</string>
+    <string name="card_list_widget_empty">Nachdem du einige Treuekarten in Catima hinzugefügt hast, werden sie hier angezeigt. Wenn du Karten hast, stelle sicher, dass diese nicht alle archiviert sind.</string>
     <string name="card_list_widget_name">Kartenliste</string>
+    <string name="cardWithNumberAndLocale">Karte <xliff:g>%d</xliff:g> (%s)</string>
+    <string name="cardWithNumber">Karte <xliff:g>%d</xliff:g></string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -117,8 +117,6 @@
     </plurals>
     <string name="importCatimaMessage">Επιλέξτε την <i>catima.zip</i> εξαγωγή από το Catima για εισαγωγή
 \nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής μιας άλλης εφαρμογής Catima κάνοντας εξαγωγή εκεί πρώτα.</string>
-    <string name="importStocardMessage">Επιλέξτε την <i>***.zip</i> εξαγωγή από το Stocard για εισαγωγή.
-\nΠάρτε το στέλνοντας email στο: support@stocardapp.com ζητώντας μια εξαγωγή αρχείων των δεδομένων σας.</string>
     <string name="intent_import_card_from_url_share_multiple_text">Θέλω να μοιραστώ μερικές κάρτες μαζί σου</string>
     <string name="editGroup">Επεξεργασία Ομάδας: <xliff:g>%s</xliff:g></string>
     <string name="setFrontImage">Επιλογή εμπρόσθιας εικόνας</string>
@@ -187,7 +185,6 @@
     <string name="noBarcodeFound">Δεν βρέθηκε γραμμωτός κώδικα</string>
     <string name="balance">Υπόλοιπο</string>
     <string name="importCatima">Εισαγωγή από Catima</string>
-    <string name="importStocard">Εισαγωγή από Stocard</string>
     <string name="importVoucherVault">Εισαγωγή από Voucher Vault</string>
     <string name="sameAsCardId">Όπως ο κωδικός</string>
     <string name="exportPassword">Προσθέστε έναν κωδικό για προστασία της εξαγωγής (προαιρετικά)</string>
@@ -303,10 +300,12 @@
     <string name="settings_column_count_7">7</string>
     <string name="generic_error_please_retry">Λυπούμαστε, κάτι πήγε στραβά, δοκιμάστε ξανά...</string>
     <string name="unsupportedFile">Το αρχείο δεν υποστηρίζεται</string>
-    <string name="addFromPkpass">Επιλογή αρχείου Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Επιλέξτε αρχείο Passbook (.pkpass / .pkpasses)</string>
     <string name="sort_by_valid_from">Έναρξη ισχύος</string>
     <string name="setBarcodeWidth">Ορισμός πλάτους γραμμωτού κώδικα</string>
     <string name="width">Πλάτος</string>
     <string name="card_list_widget_empty">Αφού προσθέσετε μερικές κάρτες επιβράβευσης στο Catima, θα εμφανιστούν εδώ. Εάν έχετε κάρτες, βεβαιωθείτε ότι δεν είναι όλες αρχειοθετημένες.</string>
     <string name="card_list_widget_name">Λίστα καρτών</string>
+    <string name="cardWithNumber">Κάρτα <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Κάρτα <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-eo/strings.xml

@@ -233,8 +233,6 @@
     <string name="settings_pink_theme">Rozkolora</string>
     <string name="field_must_not_be_empty">Kampo devas ne esti malplena</string>
     <string name="manually_enter_barcode_instructions">Entajpu la identigilon aŭ tekston sur via karto kaj premu la strikodon kiu aspektas kiel tiu sur via karto.</string>
-    <string name="importStocardMessage">Elektu la <i>***.zip</i> eksoporton de Stocard kiun vi volas importi.
-\nAkiru ĝin sendante retpoŝton al support@stocardapp.com petante eksporton de viaj datumoj.</string>
     <string name="turn_flashlight_off">Malŝalti poŝlampon</string>
     <string name="add_manually_warning_title">Skani estas rekomendata</string>
     <string name="continue_">Daŭrigi</string>
@@ -272,7 +270,6 @@
     <string name="updateBarcodeQuestionText">Vi ŝanĝis la identigon. Ĉu vi volas ankaŭ ĝisdatigi la strikodon por uzi la saman valoron?</string>
     <string name="importLoyaltyCardKeychainMessage">Elektu la <i>LoyaltyCardKeychain.csv</i> eksporton de Loyalty Card Keychain kiun vi volas importi.
 \nKreu ĝin unue de la \"Importi/eksporti\" menuo en Loyalty Card Keychain elektante \"eksporti\" tie.</string>
-    <string name="importStocard">Importi de Stocard</string>
     <string name="importVoucherVault">Importi el Voucher Vault</string>
     <string name="turn_flashlight_on">Enŝalti poŝlampon</string>
     <string name="settings_locale">Lingvo</string>

app/src/main/res/values-es-rAR/strings.xml

@@ -63,7 +63,6 @@
     <string name="cameraPermissionDeniedTitle">No se pudo acceder a la cámara</string>
     <string name="wrongValueForBarcodeType">El valor no es válido para el tipo de código de barras seleccionado</string>
     <string name="expiryDate">Fecha de vencimiento</string>
-    <string name="importStocard">Importar desde Stocard</string>
     <string name="currency">Moneda</string>
     <string name="group_edit">Editar grupo</string>
     <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
@@ -119,8 +118,6 @@
     <string name="settings_landscape_orientation">Horizontal</string>
     <string name="privacy_policy">Política de Privacidad</string>
     <string name="enter_group_name">Ingrese el nombre del grupo</string>
-    <string name="importStocardMessage">Seleccione su <i>***.zip</i> exportado desde Stocard para importarlo.
-\nObténgalo mandando un correo electrónico a support@stocardapp.com preguntando por una copia de tus datos.</string>
     <string name="addManually">Ingresar el código de barras manualmente</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os y colaboradores</string>
     <string name="importVoucherVault">Importar desde Voucher Vault</string>

app/src/main/res/values-es/strings.xml

@@ -94,8 +94,6 @@
 \nCréalo primero desde tu perfil de FidMe eligiendo Protección de datos y pulsa Extraer mis datos.</string>
     <string name="importLoyaltyCardKeychainMessage">Seleccione su <i>LoyaltyCardKeychain.csv</i> exportado desde Loyalty Card Keychain para importarlo.
 \nCréalo primero desde el menú Importar/Exportar en Loyalty Card Keychain pulsando Exportar desde allí.</string>
-    <string name="importStocardMessage">Seleccione su exportación <i>*.zip</i> de Stocard para importarla.
-\nConsígalo enviando un correo electrónico a support@stocardapp.com solicitando una exportación de sus datos.</string>
     <string name="importVoucherVaultMessage">Seleccione su <i>vouchervault.json</i> exportado desde Voucher Vault para importarlo.
 \nCréalo pulsando primero Exportar en Voucher Vault.</string>
     <string name="failedGeneratingShareURL">No se ha podido generar una URL compartible. Por favor, informe de ello.</string>
@@ -120,7 +118,6 @@
     <string name="sameAsCardId">Igual que el código</string>
     <string name="barcodeId">Valor de código de barra</string>
     <string name="importVoucherVault">Importar desde Voucher Vault</string>
-    <string name="importStocard">Importar desde Stocard</string>
     <string name="importLoyaltyCardKeychain">Importar desde Loyalty Card Keychain</string>
     <string name="importFidme">Importar desde FidMe</string>
     <string name="importCatima">Importar desde Catima</string>

app/src/main/res/values-et/strings.xml

@@ -182,8 +182,6 @@
     <string name="importFidme">Impordi FidMe varukoopiast</string>
     <string name="importFidmeMessage">Importimiseks vali oma <i>fidme-export-request-xxxxxx.zip</i>, mille oled FidMe rakendusest eksportinud. Peale importi määra triipkoodi tüübid käsistsi. \nSellise faili loomiseks vali oma FidMe profiilist eelistuse Andmekaitse-Paki lahti.</string>
     <string name="importLoyaltyCardKeychain">Impordi rakendusest Loyalty Card Keychain</string>
-    <string name="importStocard">Impordi Stocardist</string>
-    <string name="importStocardMessage">Importimiseks vali oma <i>***.zip</i> Stocardi ekspordifail. \nSellise faili saad saates kirja aadressile support@stocardapp.com ning küsides oma andmeid.</string>
     <string name="chooseImportType">Importimise valikud</string>
     <string name="importVoucherVault">Impordi rakendusest Voucher Vault</string>
     <string name="importVoucherVaultMessage">Importimiseks vali oma <i>vouchervault.json</i> Voucher Vaulti ekspordifail. \nSellise faili saad teha rakenduses Voucher Vault menüüvalikust Eksport.</string>
@@ -299,10 +297,12 @@
     <string name="settings_column_count_7">7</string>
     <string name="generic_error_please_retry">Vabandust, midagi läks nüüd viltu, palun proovi uuesti...</string>
     <string name="unsupportedFile">See fail pole toetatud</string>
-    <string name="addFromPkpass">Vali Passbooki fail (.pkpass)</string>
+    <string name="addFromPkpass">Vali Passbooki fail (.pkpass / .pkpasses)</string>
     <string name="sort_by_valid_from">Kehtib alates</string>
     <string name="setBarcodeWidth">Määratle triipkoodi laius</string>
     <string name="width">Laius</string>
     <string name="card_list_widget_name">Kaartide loend</string>
     <string name="card_list_widget_empty">Kui lisad Catimasse kliendikaarte, siis saavad nad olema nähtavad siin. Kui sul on kaardid lisatud, siis palun kontrolli, et nad kõik poleks arhiveeritud.</string>
+    <string name="cardWithNumber">Kaart: <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Kaart: <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -120,7 +120,6 @@
     <string name="noGroups">روی دکمه + اضافه کلیک کنید تا گروه‌هایی برای دسته‌بندی اضافه کنید.</string>
     <string name="editGroup">ویرایش گروه: <xliff:g>%s</xliff:g></string>
     <string name="importCatimaMessage">فایل <i>catima.zip</i> خروجی خود را از Catima برای وارد کردن انتخاب کنید.\nآن را از منوی وارد/صادر کردن در یک اپلیکیشن دیگر Catima با فشردن دکمه صادرکردن ابتدا ایجاد کنید.</string>
-    <string name="importStocard">واردات از Stocard</string>
     <string name="unsupportedBarcodeType">این نوع بارکد هنوز نمی‌تواند نمایش داده شود. ممکن است در نسخه آینده برنامه پشتیبانی شود.</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> امتیاز</item>
@@ -171,7 +170,6 @@
     <string name="accept">قبول</string>
     <string name="importCatima">واردات از کاتیما</string>
     <string name="importFidme">واردات از FidMe</string>
-    <string name="importStocardMessage">فایل خروجی <i>***.zip</i> خود را از Stocard برای وارد کردن انتخاب کنید.\nاین فایل را با ارسال ایمیل به آدرس support@stocardapp.com و درخواست خروجی داده‌های خود دریافت کنید.</string>
     <string name="importVoucherVault">واردات از صندوق کوپن</string>
     <string name="importVoucherVaultMessage">فایل خروجی <i>vouchervault.json</i> خود را از صندوق کوپن برای وارد کردن انتخاب کنید.\nآن را ابتدا با فشردن دکمه صادرکردن در صندوق کوپن ایجاد کنید.</string>
     <string name="barcodeId">مقدار بارکد</string>

app/src/main/res/values-fi/strings.xml

@@ -142,9 +142,6 @@
         <item quantity="one"><xliff:g>%d</xliff:g> valittu</item>
         <item quantity="other"><xliff:g>%d</xliff:g> valitut</item>
     </plurals>
-    <string name="importStocard">Tuo Stocardista</string>
-    <string name="importStocardMessage">Valitse tuotava <i>***.zip</i>-vienti Stocardista.
-\nHanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
     <string name="passwordRequired">Ole hyvä ja syötä salasana</string>
     <string name="failedGeneratingShareURL">Jaettavaa URL-osoitetta ei voitu luoda. Ilmoita tästä.</string>
     <string name="turn_flashlight_on">Käytä taskulamppua</string>

app/src/main/res/values-fr/strings.xml

@@ -129,9 +129,6 @@
     <string name="backImageDescription">Image du verso</string>
     <string name="frontImageDescription">Image du recto</string>
     <string name="passwordRequired">Veuillez entrer le mot de passe</string>
-    <string name="importStocardMessage">Sélectionnez votre exportation <i>***.zip</i> de Stocard pour l’importer.
-\nVous pouvez l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
-    <string name="importStocard">Importer depuis Stocard</string>
     <string name="turn_flashlight_off">Éteindre la lampe de poche</string>
     <string name="turn_flashlight_on">Allumer la lampe de poche</string>
     <string name="failedGeneratingShareURL">Impossible de générer une URL partageable. Veuillez signaler ceci.</string>
@@ -308,7 +305,7 @@
     <string name="settings_automatic_column_count">Automatique</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
-    <string name="addFromPkpass">Sélectionner un fichier Cartes / Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Sélectionner un fichier Cartes / Passbook (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">Ce fichier n\'est pas supporté</string>
     <string name="generic_error_please_retry">Désolé, un problème est survenu, veuillez réessayer...</string>
     <string name="sort_by_valid_from">Valide à partir du</string>
@@ -316,4 +313,6 @@
     <string name="setBarcodeWidth">Définir la largeur du code-barres</string>
     <string name="card_list_widget_name">Liste des cartes</string>
     <string name="card_list_widget_empty">Après avoir ajouter des cartes de fidélité dans Catima, elles apparaîtront ici. Si vous avez des cartes, assurez-vous qu\'elles ne soient pas archivées.</string>
+    <string name="cardWithNumber">Carte <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Carte <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-gl/strings.xml

@@ -123,8 +123,6 @@
     <string name="importFidmeMessage">Elixe o ficheiro exportado <i>fidme-export-request-xxxxxx.zip</i> desde FidMe, e despois elixe manualmente o tipo de código de barras.\nCréao no teu perfil FidMe en Protección de Datos e despois premendo en Extraer os meus datos.</string>
     <string name="importLoyaltyCardKeychain">Importar desde Loyalty Card Keychain</string>
     <string name="importLoyaltyCardKeychainMessage">Elixe o ficheiro de exportación <i>LoyaltyCardKeychain.csv</i> desde Loyalty Card Keychain \nCréao no menú Importar/Exportar en Loyalty Card Keychain premendo en Exportar.</string>
-    <string name="importStocard">Importar desde Stocard</string>
-    <string name="importStocardMessage">Elixe o ficheiro <i>***.zip</i> desde Stocard. \nPodes obtelo escribindo un correo a support@stocardapp.com e pedindo a exportación dos datos.</string>
     <string name="importVoucherVault">Importar desde Voucher Vault</string>
     <string name="importVoucherVaultMessage">Selecciona o ficheiro de exportación <i>vouchervault.json</i> desde Voucher Vault. \nCréao premendo en Exportar en Voucher Vault.</string>
     <string name="barcodeId">Valor do código de barras</string>
@@ -297,11 +295,13 @@
     <string name="addFromPdfFile">Elixe un ficheiro PDF</string>
     <string name="errorReadingFile">Non se puido ler o ficheiro</string>
     <string name="unsupportedFile">Este ficheiro non é compatible</string>
-    <string name="addFromPkpass">Selecciona un ficheiro Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Selecciona un ficheiro Passbook (.pkpass / .pkpasses)</string>
     <string name="generic_error_please_retry">Sentímolo, pero algo fallou, inténtao outra vez…</string>
     <string name="sort_by_valid_from">Válido desde</string>
     <string name="width">Anchura</string>
     <string name="setBarcodeWidth">Establecer anchura do código de barras</string>
     <string name="card_list_widget_name">Lista de tarxetas</string>
     <string name="card_list_widget_empty">Aquí aparecerán as tarxetas fidelidade cando as engadas a Catima. Se tes tarxetas mira que non estean arquivadas.</string>
+    <string name="cardWithNumber">Tarxeta <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Tarxeta <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -136,7 +136,6 @@
     <string name="balanceParsingFailed">अमान्य शेष राशि</string>
     <string name="takePhoto">एक फोटो खींचें</string>
     <string name="wrongValueForBarcodeType">चयनित बारकोड प्रकार के लिए मान्य नहीं है</string>
-    <string name="importStocard">स्टोकार्ड (Stocard) से आयात करें</string>
     <string name="app_loyalty_card_keychain">लॉयल्टी कार्ड कीचेन</string>
     <string name="no">नहीं</string>
     <string name="importFidme">Fidme से आयात करें</string>
@@ -155,7 +154,6 @@
     <string name="balanceSentence">शेष राशि: <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">कार्ड देखते समय स्क्रीन का लॉक हो जाना बंद करें</string>
     <string name="expiryStateSentenceExpired">समय अवधि समाप्त: <xliff:g>%s</xliff:g></string>
-    <string name="importStocardMessage">आयात करने के लिए स्टोकार्ड (स्टोकार्ड) से अपना <i>***.zip</i> निर्यात चुनें।\nअपने डेटा के निर्यात के लिए support@stocardapp.com पर ई-मेल करके इसे प्राप्त करें।</string>
     <string name="app_libraries">लिब्रे तृतीय-पक्ष लाइब्रेरी: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">लिब्रे तृतीय-पक्ष संसाधन: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="settings_keep_screen_on_summary">कार्ड देखते समय स्क्रीन टाइमआउट बंद करें</string>

app/src/main/res/values-hr/strings.xml

@@ -75,8 +75,6 @@
         <item quantity="few"><xliff:g>%d</xliff:g> kartice</item>
         <item quantity="other"><xliff:g>%d</xliff:g> kartica</item>
     </plurals>
-    <string name="importStocardMessage">Odaberi tvoju iz Stocard izvezenu <i>***.zip</i> datoteku koju želiš uvesti.
-\nPošalji e-mail na support@stocardapp.com s molbom za izvoz tvojih podataka.</string>
     <string name="translate_platform">na platformi Weblate</string>
     <string name="editGroup">Uređivanje grupe: <xliff:g>%s</xliff:g></string>
     <string name="editBarcode">Uredi crtični kod</string>
@@ -85,8 +83,7 @@
     <string name="accept">Prihvati</string>
     <string name="importCatima">Uvezi iz Catima</string>
     <string name="importFidme">Uvezi iz FidMe</string>
-    <string name="importStocard">Uvezi iz Stocard</string>
-    <string name="importLoyaltyCardKeychainMessage">Odaberi tvoju iz LoyaltyCardKeychain izvezenu <i>LoyaltyCardKeychain.csv</i> datoteku koju želiš uvesti. 
+    <string name="importLoyaltyCardKeychainMessage">Odaberi tvoju iz LoyaltyCardKeychain izvezenu <i>LoyaltyCardKeychain.csv</i> datoteku koju želiš uvesti.
 \nStvori je putem izbornika „Uvoz/Izvoz” u aplikaciji Loyalty Card Keychain i tamo pritisni „Izvoz”.</string>
     <string name="updateBarcodeQuestionText">Promijenio/la si ID. Želiš li također aktualizirati crtični kod da koristi istu vrijednost\?</string>
     <string name="importCards">Uvezi kartice</string>
@@ -308,8 +305,13 @@
     <string name="settings_column_count_5">5</string>
     <string name="settings_column_count_7">7</string>
     <string name="generic_error_please_retry">Žao nam je, nešto nije u redu, pokušaj ponovo …</string>
-    <string name="addFromPkpass">Odaberi jednu Passbook datoteku (.pkpass)</string>
+    <string name="addFromPkpass">Odaberi jednu Passbook datoteku (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">Ova datoteka nije podržana</string>
     <string name="settings_use_volume_keys_navigation_summary">Pomoću gumba za glasnoću promijeni koja se kartica prikazuje</string>
     <string name="settings_use_volume_keys_navigation">Mijenjaj kartice pomoću gumba za glasnoću</string>
+    <string name="width">Širina</string>
+    <string name="card_list_widget_name">Popis kartica</string>
+    <string name="setBarcodeWidth">Postavi širinu barkoda</string>
+    <string name="cardWithNumber">Kartica <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Kartica <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -50,8 +50,6 @@
     <string name="deleteTitle">Kártya törlése</string>
     <string name="barcodeImageDescriptionWithType">A(z) <xliff:g>%s</xliff:g> vonalkód képe</string>
     <string name="noCardExistsError">A kártya nem található</string>
-    <string name="importStocardMessage">Válassza ki az importálandó <i>***.zip</i> Stocard export fájlt.
-\nAz adatainak exportálását a support@stocardapp.com címre írt levélben kérheti.</string>
     <string name="importVoucherVault">Importálás a Voucher Vaultból</string>
     <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a kiválasztott vonalkódtípushoz</string>
     <string name="settings_green_theme">Zöld</string>
@@ -125,7 +123,6 @@
     <string name="importLoyaltyCardKeychain">Importálás a Loyalty Card Keychainből</string>
     <string name="importLoyaltyCardKeychainMessage">Válassza ki a Loyalty Card Keychainből importálandó <i>LoyaltyCardKeychain.csv</i> export fájlt.
 \nEzt hozza létre a Loyalty Card Keychainben az Importálás/exportálás menüben, az Exportálás megnyomásával.</string>
-    <string name="importStocard">Importálás a Stocardból</string>
     <string name="importVoucherVaultMessage">Válassza ki az importálandó <i>vouchervault.json</i> Voucher Vault export fájlt.
 \nEzt hozza létre a Voucher Vaultban az Exportálás megnyomásával.</string>
     <string name="barcodeId">Vonalkód értéke</string>

app/src/main/res/values-in-rID/strings.xml

@@ -139,9 +139,6 @@
     <string name="importLoyaltyCardKeychain">Impor dari Loyalty Card Keychain</string>
     <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor.
 \nBuat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
-    <string name="importStocard">Impor dari Stocard</string>
-    <string name="importStocardMessage">Pilih ekspor <i>***.zip</i> Anda dari Stocard untuk diimpor.
-\nDapatkan dengan mengirim email ke support@stocardapp.com untuk meminta ekspor data Anda.</string>
     <string name="importVoucherVault">Impor dari Voucher Vault</string>
     <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Voucher Vault untuk diimpor.
 \nBuat dengan menekan Ekspor di Voucher Vault terlebih dahulu.</string>
@@ -296,7 +293,7 @@
     <string name="settings_column_count_1">1</string>
     <string name="settings_column_count_4">4</string>
     <string name="settings_column_count_5">5</string>
-    <string name="addFromPkpass">Pilih file Buku Tabungan (.pkpass)</string>
+    <string name="addFromPkpass">Pilih file Buku Tabungan (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">File ini tidak didukung</string>
     <string name="generic_error_please_retry">Maaf, terjadi kesalahan, silakan coba lagi...</string>
     <string name="sort_by_valid_from">Berlaku dari</string>

app/src/main/res/values-it/strings.xml

@@ -129,9 +129,6 @@
     <string name="backImageDescription">Immagine posteriore</string>
     <string name="frontImageDescription">Immagine frontale</string>
     <string name="passwordRequired">Si prega di inserire la password</string>
-    <string name="importStocardMessage">Seleziona il tuo file di esportazione <i>***.zip</i> da Stocard per importarlo.
-\nOttienilo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
-    <string name="importStocard">Importa da Stocard</string>
     <string name="turn_flashlight_off">Spegni la torcia</string>
     <string name="turn_flashlight_on">Accendi la torcia</string>
     <string name="failedGeneratingShareURL">Impossibile generare un URL condivisibile. Si prega di segnalarlo.</string>

app/src/main/res/values-ja/strings.xml

@@ -128,9 +128,6 @@
     <string name="photos">画像</string>
     <string name="backImageDescription">裏</string>
     <string name="frontImageDescription">表</string>
-    <string name="importStocardMessage">Stocardでエクスポートした<i>***.zip</i>ファイルを選択してください。
-\nファイルがない場合、e-mailing support@stocardapp.comにデータのエクスポートを要求してください。</string>
-    <string name="importStocard">Stocardからインポート</string>
     <plurals name="selectedCardCount">
         <item quantity="other">選択済み: <xliff:g>%d</xliff:g> 枚</item>
     </plurals>

app/src/main/res/values-ko/strings.xml

@@ -229,9 +229,6 @@
     <string name="importLoyaltyCardKeychainMessage">가져올 포인트 카드 키체인에서 <i>LoyaltyCardKeychain.csv</i> 내보내기를 선택합니다.
 \n먼저 내보내기를 눌러 로열티 카드 키체인의 가져오기/내보내기 메뉴에서 만드십시오.</string>
     <string name="setBarcodeId">바코드 값 설정</string>
-    <string name="importStocard">Stocard에서 가져오기</string>
-    <string name="importStocardMessage">가져올 Stocard에서 <i>***.zip</i> 내보내기를 선택합니다.
-\nsupport@stocardapp.com으로 이메일을 보내 데이터 내보내기를 요청하면 받을 수 있습니다.</string>
     <string name="importVoucherVault">Voucher Vault에서 가져오기</string>
     <string name="importVoucherVaultMessage">가져올 Voucher Vault에서 <i>vouchervault.json</i> 내보내기를 선택합니다.
 \n먼저 바우처 금고에서 내보내기를 눌러 생성하세요.</string>

app/src/main/res/values-lb/strings.xml

@@ -59,7 +59,6 @@
     <string name="exportOptionExplanation">D \' Donnéeë ginn op eng Plaz vun Hirer Wal geschriwwen.</string>
     <string name="accept">Averstane</string>
     <string name="settings_display_barcode_max_brightness">Erhellen barcode-Usiicht</string>
-    <string name="importStocard">Importéieren vun Stocard</string>
     <string name="importLoyaltyCardKeychain">Import vun Loyalty Card Keychain</string>
     <string name="setBarcodeId">Leeë Si barcode-Wäert</string>
     <string name="wrongValueForBarcodeType">De Wäert ass fir de ausgewielt Barcode-Typ net gëllt</string>

app/src/main/res/values-lt/strings.xml

@@ -65,9 +65,6 @@
     <string name="setBarcodeId">Nustatyti brūkšninio kodo reikšmę</string>
     <string name="sameAsCardId">Tokia pat kaip ID</string>
     <string name="barcodeId">Brūkšninio kodo reikšmė</string>
-    <string name="importStocardMessage">Pasirinkite <i>***.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
-\nGaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
-    <string name="importStocard">Importuoti iš Stocard</string>
     <string name="importFidmeMessage">Pasirinkite <i>fidme-export-request-xxxxxx.zip</i> eksportą iš FidMe, kurį norite importuoti, ir po to brūkšninių kodų tipus pasirinkite rankiniu būdu.
 \nSukurkite jį iš savo FidMe profilio, pasirinkę Duomenų apsauga ir pirmiausia paspaudę Išgauti mano duomenis.</string>
     <string name="importFidme">Importuoti iš FidMe</string>

app/src/main/res/values-lv/strings.xml

@@ -177,8 +177,6 @@
     <string name="importFidme">Ievietot no FidMe</string>
     <string name="importFidmeMessage">Jāatlasa sava <i>fidme-export-request-xxxxxx.zip</i> izguves datne no FidMe, lai ievietotu, un pēc tam pašrocīgi jāatlasa svītrkodu veidi. \nTo var izveidot savā FidMe profila sadaļā \"Data Protection\" spiežot \"Extract my data\".</string>
     <string name="importLoyaltyCardKeychain">Ievietot no Loyalty Card Keychain</string>
-    <string name="importStocard">Ievietot no Stocard</string>
-    <string name="importStocardMessage">Jāatlasa sava <i>***.zip</i> izguves datne no Stocard, lai ievietotu. \nTo var iegūt, ja nosūta lūgumu izgūt savus datus uz e-pasta adresi support@stocardapp.com.</string>
     <string name="importVoucherVault">Ievietot no Voucher Vault</string>
     <string name="importVoucherVaultMessage">Jāatlasa sava <i>vouchervaldt.json</i> izguves datne no Voucher Vault, lai ievietotu. \nTo var izveidot spiežot \"Export\" Voucher Vault.</string>
     <string name="barcodeId">Svītrkoda vērtība</string>
@@ -304,11 +302,13 @@
     <string name="settings_column_count_portrait">Kolonnas stateniskā novietojumā</string>
     <string name="settings_column_count_landscape">Kolonnas līmeniskā novietojumā</string>
     <string name="unsupportedFile">Šī datne netiek atbalstīta</string>
-    <string name="addFromPkpass">Atlasīt Passbook datni (.pkpass)</string>
+    <string name="addFromPkpass">Atlasīt Passbook datni (.pkpass/.pkpasses)</string>
     <string name="generic_error_please_retry">Atvainojamies, kaut kas nogāja greizi. Lūgums mēģināt vēlreiz...</string>
     <string name="sort_by_valid_from">Derīga no</string>
     <string name="setBarcodeWidth">Iestatīt svītrkoda platumu</string>
     <string name="width">Platums</string>
     <string name="card_list_widget_name">Karšu saraksts</string>
     <string name="card_list_widget_empty">Pēc klienta karšu pievienošanas Catima tās parādīsies šeit. Ja Tev ir kartes, jāpārliecinās, ka tās visas nav arhivētas.</string>
+    <string name="cardWithNumber">Karte <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Karte <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -126,10 +126,7 @@
     <string name="photos">Bilder</string>
     <string name="backImageDescription">Baksidebilde</string>
     <string name="frontImageDescription">Forsidebilde</string>
-    <string name="importStocardMessage">Velg din <i>***.zip</i>-eksport fra Stocard å importere.
-\nSkaff den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
     <string name="passwordRequired">Skriv inn passordet</string>
-    <string name="importStocard">Importer fra Stocard</string>
     <string name="failedGeneratingShareURL">Klarte ikke å lage delbar nettadresse. Rapporter denne feilen.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> valgt</item>

app/src/main/res/values-nl/strings.xml

@@ -129,9 +129,6 @@
     <string name="backImageDescription">Achterzijde van kaart</string>
     <string name="frontImageDescription">Voorzijde van kaart</string>
     <string name="passwordRequired">Voer het wachtwoord in</string>
-    <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***.zip</i>.
-\nStuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
-    <string name="importStocard">Importeren uit Stocard</string>
     <string name="failedGeneratingShareURL">De te delen link kan niet worden gegenereerd. Meld deze fout.</string>
     <string name="turn_flashlight_off">Zaklamp uitzetten</string>
     <string name="turn_flashlight_on">Zaklamp aanzetten</string>

app/src/main/res/values-pl/strings.xml

@@ -102,9 +102,6 @@
     <string name="importVoucherVaultMessage">Wybierz swój <i>vouchervault.json</i> z Voucher Vault, aby zaimportować.
 \nUtwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
     <string name="importVoucherVault">Importuj z Voucher Vault</string>
-    <string name="importStocardMessage">Wybierz swój <i>***.zip</i> z Stocard, aby zaimportować.
-\nUzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
-    <string name="importStocard">Importuj z Stocard</string>
     <string name="importLoyaltyCardKeychainMessage">Wybierz swój <i>LoyaltyCardKeychain.csv</i> z Loyalty Card Keychain, aby zaimportować.
 \nUtwórz go z menu Importuj/Eksportuj w Loyalty Card Keychain, wpierw klikając tam Eksportuj.</string>
     <string name="importLoyaltyCardKeychain">Importuj z Loyalty Card Keychain</string>
@@ -314,7 +311,7 @@
     <string name="settings_column_count_landscape">Kolumny w trybie pejzażu</string>
     <string name="settings_automatic_column_count">Automatycznie</string>
     <string name="settings_column_count_1">1</string>
-    <string name="addFromPkpass">Wybierz plik Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Wybierz plik Passbook (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">Ten plik nie jest obsługiwany</string>
     <string name="generic_error_please_retry">Coś poszło nie tak, spróbuj ponownie później...</string>
     <string name="sort_by_valid_from">Poprawna forma</string>
@@ -322,4 +319,6 @@
     <string name="width">Szerokość</string>
     <string name="card_list_widget_empty">Karty lojalnościowe dodane w aplikacji Catima pokażą się tutaj. Jeżeli masz jakieś karty, upewnij się że nie są one zarchiwizowane.</string>
     <string name="card_list_widget_name">Lista kart</string>
+    <string name="cardWithNumber">Karta <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Karta <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -85,7 +85,6 @@
     <string name="importLoyaltyCardKeychainMessage">Selecionar arquivo <i>LoyaltyCardKeychain.csv</i>, exportado do Loyalty Card Keychain, para importação.
 \nPrimeiro, crie-o pelo menu Importar/Exportar no Loyalty Card Keychain clicando em Exportar.</string>
     <string name="setBarcodeId">Definir valor do código de barras</string>
-    <string name="importStocard">Importar de Stocard</string>
     <string name="importVoucherVault">Importar de Cofre de Vouchers</string>
     <string name="barcodeId">Valor no código de barras</string>
     <string name="sameAsCardId">Igual ao ID</string>
@@ -280,8 +279,6 @@
     <string name="importFidme">Importar de FidMe</string>
     <string name="importFidmeMessage">Selecione o arquivo <i>fidme-export-request-xxxxxx.zip</i>, exportado de FidMe, para importação e em seguida selecione o tipo de código de barras manualmente.
 \nCrie-o pelo seu perfil no FidMe escolhendo \'Proteção de Dados\' (Data Protection) e então clicando em \"Extrair meus dados\".</string>
-    <string name="importStocardMessage">Selecionar arquivo <i>***.zip</i>, exportado de Stocard, para importação.
-\nObtenha-o enviando um e-mail para support@stocardapp.com solicitando exportação dos seus dados.</string>
     <string name="importVoucherVaultMessage">Selecionar arquivo<i>vouchervault.json</i>, exportado de Voucher Vault, para importação.
 \nPrimeiro, crie-o pressionando em Exportar no Voucher Vault.</string>
     <string name="enter_card_id">Insira o ID ou texto escrito no seu cartão</string>
@@ -309,11 +306,13 @@
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
     <string name="unsupportedFile">Este arquivo não é suportado</string>
-    <string name="addFromPkpass">Selecionar um arquivo do gerenciador de senhas (.pkpass)</string>
+    <string name="addFromPkpass">Selecionar um arquivo do gerenciador de senhas (.pkpass / .pkpasses)</string>
     <string name="generic_error_please_retry">Desculpe, alguma coisa deu errado, por favor tente novamente...</string>
     <string name="sort_by_valid_from">Válido a partir de</string>
     <string name="width">Largura</string>
     <string name="setBarcodeWidth">Definir largura do código de barras</string>
     <string name="card_list_widget_name">Lista de cartões</string>
     <string name="card_list_widget_empty">Depois que você adicionar alguns cartões de fidelidade no Catima, eles aparecerão aqui. Se você tiver cartões, verifique se eles não estão todos arquivados.</string>
+    <string name="cardWithNumber">Cartão <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Cartão <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -86,8 +86,6 @@
     <string name="sameAsCardId">Igual ao identificador</string>
     <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente.
 \nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
-    <string name="importStocardMessage">Selecione a exportação <i>***.zip</i> do Stocard para importar.
-\nObtenha-o através do e-mail support@stocardapp.com solicitando uma exportação dos seus dados.</string>
     <string name="barcodeId">Valor do código de barras</string>
     <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>
     <string name="intent_import_card_from_url_share_multiple_text">Quero partilhar alguns cartões</string>
@@ -138,7 +136,6 @@
     <string name="importLoyaltyCardKeychain">Importar do Loyalty Card Keychain</string>
     <string name="importLoyaltyCardKeychainMessage">Selecione a exportação <i>LoyaltyCardKeychain.csv</i> do Loyalty Card Keychain para importar.
 \nPrimeiro crie a exportação no menu \"Importar / exportar\" no Loyalty Card Keychain pressionando \"Exportar\".</string>
-    <string name="importStocard">Importar do Stocard</string>
     <string name="importVoucherVault">Importar do Voucher Vault</string>
     <string name="importVoucherVaultMessage">Selecione a exportação <i>vouchervault.json</i> do Voucher Vault para importar.
 \nCrie-a primeiro pressionando a opção \"Exportar\" no Voucher Vault.</string>
@@ -308,7 +305,7 @@
     <string name="settings_column_count_3">3</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
-    <string name="addFromPkpass">Selecionar um ficheiro Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Selecionar um ficheiro Passbook (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">Este ficheiro não é suportado</string>
     <string name="generic_error_please_retry">Lamento, ocorreu um erro, tente novamente...</string>
     <string name="sort_by_valid_from">Válido a partir de</string>
@@ -316,4 +313,6 @@
     <string name="setBarcodeWidth">Definir a largura do código de barras</string>
     <string name="card_list_widget_name">Lista de cartões</string>
     <string name="card_list_widget_empty">Após adicionar cartões de fidelidade em Catima, eles aparecerão aqui. Se tem cartões, certifique-se de que não estão todos arquivados.</string>
+    <string name="cardWithNumber">Cartão <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Cartão <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -166,8 +166,6 @@
     <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente. \nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
     <string name="importLoyaltyCardKeychain">Importar do Loyalty Card Keychain</string>
     <string name="importLoyaltyCardKeychainMessage">Selecione a exportação <i>LoyaltyCardKeychain.csv</i> do Loyalty Card Keychain para importar. \nPrimeiro crie a exportação no menu \"Importar / exportar\" no Loyalty Card Keychain pressionando \"Exportar\".</string>
-    <string name="importStocard">Importar do Stocard</string>
-    <string name="importStocardMessage">Selecione a exportação <i>***.zip</i> do Stocard para importar. \nObtenha-o através do e-mail support@stocardapp.com solicitando uma exportação dos seus dados.</string>
     <string name="importVoucherVault">Importar do Voucher Vault</string>
     <string name="importVoucherVaultMessage">Selecione a exportação <i>vouchervault.json</i> do Voucher Vault para importar. \nCrie-a primeiro pressionando a opção \"Exportar\" no Voucher Vault.</string>
     <string name="unsupportedBarcodeType">Este tipo de código de barras ainda não pode ser mostrado. Pode vir a ser suportado numa versão posterior da aplicação.</string>
@@ -303,11 +301,13 @@
     <string name="exportCancelled">Exportação cancelada</string>
     <string name="useFrontImage">Utilizar imagem frontal</string>
     <string name="useBackImage">Utilizar imagem do verso</string>
-    <string name="addFromPkpass">Selecionar um ficheiro Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Selecionar um ficheiro Passbook (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">Este ficheiro não é suportado</string>
     <string name="generic_error_please_retry">Lamento, ocorreu um erro, tente novamente...</string>
     <string name="setBarcodeWidth">Definir Largura do Código de Barra</string>
     <string name="width">Largura</string>
     <string name="card_list_widget_name">Lista de cartões</string>
     <string name="card_list_widget_empty">Após adicionar cartões de fidelidade em Catima, eles aparecerão aqui. Se tem cartões, certifique-se de que não estão todos arquivados.</string>
+    <string name="cardWithNumber">Cartão <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Cartão <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -90,7 +90,6 @@
     <string name="photos">Imagini</string>
     <string name="noGiftCardsGroup">Adăugați câteva carduri, iar apoi atribuiți-le grupului aici.</string>
     <string name="importCatima">Importați din Catima</string>
-    <string name="importStocard">Importați din Stocard</string>
     <string name="intent_import_card_from_url_share_multiple_text">Aș dori să partajez niște carduri cu tine</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Drepturi de autor © 2019–<xliff:g>%d</xliff:g> Sylvia van Os și contribuitorii</string>
     <string name="translate_platform">pe Weblate</string>
@@ -203,7 +202,6 @@
     <string name="setBarcodeHeight">Setați înălțimea codului de bare</string>
     <string name="settings_landscape_orientation">Orizontal</string>
     <string name="privacy_policy">Politica de Confidențialitate</string>
-    <string name="importStocardMessage">Selectați exportul dvs. <i>***.zip</i> din Stocard pentru a-l importa.\nGenerați întâi fișierul solicitând prin e-mail către support@stocardapp.com un export al datelor dumneavoastră.</string>
     <string name="openBackImageInGalleryApp">Deschideți imaginea din spate în aplicația galerie</string>
     <string name="settings_system_locale">Sistem</string>
     <string name="updateBalance">Actualizați balanța</string>

app/src/main/res/values-ru/strings.xml

@@ -130,10 +130,7 @@
     <string name="backImageDescription">Задняя сторона</string>
     <string name="frontImageDescription">Лицевая сторона</string>
     <string name="photos">Фото</string>
-    <string name="importStocardMessage">Выберите для импортирования файл <i>***.zip</i>.
-\nЭтот файл можно получить по электронной почте от support@stocardapp.com, предварительно запросив экспорт ваших данных.</string>
     <string name="passwordRequired">Введите пароль</string>
-    <string name="importStocard">Импорт из Stocard</string>
     <string name="failedGeneratingShareURL">Невозможно создать URL для обмена. Пожалуйста, сообщите об этом.</string>
     <string name="turn_flashlight_off">Отключить вспышку</string>
     <string name="turn_flashlight_on">Включить вспышку</string>
@@ -315,11 +312,13 @@
     <string name="settings_column_count_5">5</string>
     <string name="settings_column_count_6">6</string>
     <string name="unsupportedFile">Данный файл не поддерживается</string>
-    <string name="addFromPkpass">Выбрать файл Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Выбрать файл Passbook (.pkpass / .pkpasses)</string>
     <string name="generic_error_please_retry">Извините, что-то пошло не так, попробуйте ещё раз…</string>
     <string name="sort_by_valid_from">Начало действия</string>
     <string name="width">Ширина</string>
     <string name="setBarcodeWidth">Указать ширину штрих-кода</string>
     <string name="card_list_widget_name">Список карт</string>
     <string name="card_list_widget_empty">После добавления карт лояльности в Catima, они появятся здесь. Если у вас есть карты, убедитесь, что они не архивированы.</string>
+    <string name="cardWithNumber">Карта <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Карта <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -136,7 +136,6 @@
     <string name="translate_platform">na Weblate</string>
     <string name="showMoreInfo">Zobraziť podrobnosti</string>
     <string name="yes">Áno</string>
-    <string name="importStocard">Import z aplikácie Stocard</string>
     <string name="selectColor">Vybrať farbu</string>
     <string name="setIcon">Nastavenie miniatúry</string>
     <string name="settings_catima_theme">Catima</string>
@@ -233,8 +232,6 @@
     <string name="settings_landscape_orientation">Na šírku</string>
     <string name="importFidmeMessage">Vyberte svoj <i>fidme-export-request-xxxxxx.zip</i> export zo služby FidMe pre import a potom vyberte typy čiarových kódov ručne.
 \nVytvorte ho z profilu FidMe tak, že najprv vyberiete položku Ochrana údajov a potom stlačíte tlačidlo Extrahovať moje údaje.</string>
-    <string name="importStocardMessage">Vyberte svoj <i>***.zip</i> export zo Stocard pre import.
-\nZískate ho zaslaním e-mailu na adresu support@stocardapp.com, v ktorom požiadate o export svojich údajov.</string>
     <string name="currentBalanceSentence">Aktuálny zostatok: <xliff:g>%s</xliff:g></string>
     <string name="intent_import_card_from_url_share_multiple_text">Chcem sa s vami zdielať karty</string>
     <string name="app_contributors">Podporili: <xliff:g id="app_contributors">%s</xliff:g></string>
@@ -311,9 +308,11 @@
     <string name="settings_column_count_5">5</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
-    <string name="addFromPkpass">Vyberte súbor Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Vyberte súbor Passbook (.pkpass / .pkpasses)</string>
     <string name="settings_use_volume_keys_navigation">Zmena kariet pomocou tlačidiel hlasitosti</string>
     <string name="settings_use_volume_keys_navigation_summary">Pre posúvanie medzi kartami používať tlačidlá hlasitosti</string>
     <string name="card_list_widget_name">Zoznam kariet</string>
     <string name="card_list_widget_empty">Po pridaní vernostných kariet do Catima sa zobrazia tu. Ak máte karty, uistite sa, že nie sú všetky archivované.</string>
+    <string name="cardWithNumber">Karta <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Karta <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-sl/strings.xml

@@ -1,85 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Dodaj</string>
-    <string name="noGiftCards">Pritisnite gumb + za dodajanje nove kartice ali gumb⋮v meniju za uvoz baze kartic iz datoteke.</string>
+    <string name="noGiftCards">Pritisni gumb + za dodajanje nove kartice ali gumb ⋮ v meniju za uvoz.</string>
     <string name="storeName">Ime</string>
-    <string name="note">Zabeležka</string>
+    <string name="note">Opomba</string>
     <string name="cardId">Št. kartice</string>
     <string name="cancel">Prekliči</string>
     <string name="save">Shrani</string>
     <string name="edit">Uredi</string>
     <string name="delete">Izbriši</string>
     <string name="confirm">Potrdi</string>
-    <string name="ok">Vredu</string>
-    <string name="sendLabel">Pošlji…</string>
-    <string name="editCardTitle">Uredi kartico zvestobe</string>
-    <string name="addCardTitle">Dodaj kartico zvestobe</string>
+    <string name="ok">V redu</string>
+    <string name="sendLabel">Pošlji …</string>
+    <string name="editCardTitle">Uredi kartico</string>
+    <string name="addCardTitle">Dodaj kartico</string>
     <string name="scanCardBarcode">Skeniraj črtno kodo</string>
     <string name="cardShortcut">Bližnjica do kartice</string>
-    <string name="noCardsMessage">Najprej dodajte kartico</string>
-    <string name="noCardExistsError">Te kartice zvestobe ni bilo mogoče najti</string>
-    <string name="importExport">Uvozi/izvozi</string>
+    <string name="noCardsMessage">Najprej dodaj kartico</string>
+    <string name="noCardExistsError">Te kartice ni bilo mogoče najti</string>
+    <string name="importExport">Uvozi/Izvozi</string>
     <string name="exportName">Izvozi</string>
-    <string name="importExportHelp">Varnostna kopija podatkovne baze kartic zvestobe omogoča prenos baze kartic tudi na drugo napravo.</string>
+    <string name="importExportHelp">Varnostna kopija podatkovne baze omogoča prenos na drugo napravo.</string>
     <string name="importSuccessfulTitle">Uvoz je bil uspešen</string>
     <string name="importFailedTitle">Uvoz ni uspel</string>
-    <string name="importFailed">Napaka pri uvozu baze</string>
+    <string name="importFailed">Napaka pri uvozu</string>
     <string name="exportSuccessfulTitle">Izvoz je uspel</string>
     <string name="exportFailedTitle">Izvoz ni uspel</string>
-    <string name="exportFailed">Napaka pri izvozu baze</string>
-    <string name="importing">Uvažanje…</string>
-    <string name="exporting">Izvažanje…</string>
+    <string name="exportFailed">Izvoza ni bilo mogoče izvesti</string>
+    <string name="importing">Uvažanje …</string>
+    <string name="exporting">Izvažanje …</string>
     <string name="importOptionFilesystemTitle">Uvozi iz datotečnega sistema</string>
-    <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema.</string>
+    <string name="importOptionFilesystemExplanation">Izberi specifično datoteko iz datotečnega sistema.</string>
     <string name="importOptionFilesystemButton">Iz datotečnega sistema</string>
     <string name="about">Več o aplikaciji</string>
-    <string name="app_license">Odprtokodna programska oprema, licencirana skladno s GPL3+</string>
+    <string name="app_license">Prosta programska oprema s copyleftom, licenca GPL3+</string>
     <string name="about_title_fmt">Več o <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>
-    <string name="selectBarcodeTitle">Izberite črtno kodo</string>
+    <string name="selectBarcodeTitle">Izberi črtno kodo</string>
     <string name="thumbnailDescription">Sličica</string>
     <string name="settings">Nastavitve</string>
-    <string name="settings_display_barcode_max_brightness">Povečaj osvetljenost prikaza črtne kode</string>
-    <string name="deleteTitle">Odstrani kartico zvestobe</string>
-    <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico\?</string>
+    <string name="settings_display_barcode_max_brightness">Povečaj osvetljenost zaslona</string>
+    <string name="deleteTitle">Izbriši kartico</string>
+    <string name="deleteConfirmation">Prosim potrdi, če želiš izbrisati to kartico?</string>
     <string name="card">Kartica</string>
-    <string name="addFromImage">Izberite sliko iz galerije</string>
-    <string name="addManually">Ročno vnesite ID kartice</string>
-    <string name="leaveWithoutSaveConfirmation">Zapustite brez shranjevanja\?</string>
+    <string name="addFromImage">Izberi sliko iz galerije</string>
+    <string name="addManually">Ročno vnesi črtno kodo</string>
+    <string name="leaveWithoutSaveConfirmation">Zapusti brez shranjevanja?</string>
     <string name="leaveWithoutSaveTitle">Izhod</string>
     <string name="moveDown">Premikanje navzdol</string>
     <string name="moveUp">Premik navzgor</string>
-    <string name="failedOpeningFileManager">Najprej namestite upravitelja datotek.</string>
+    <string name="failedOpeningFileManager">Najprej namesti upravitelja datotek.</string>
     <string name="deleteConfirmationGroup">Brisanje skupine\?</string>
     <string name="all">Vse</string>
     <string name="noGroupCards">Ta skupina je prazna</string>
-    <string name="noGroups">Pritisnite gumb \"+\", če želite dodati skupine za kategorizacijo.</string>
+    <string name="noGroups">Pritisni gumb +, če želiš dodati skupine za kategorizacijo.</string>
     <string name="groups">Skupine</string>
-    <string name="enter_group_name">Vnesite ime skupine</string>
+    <string name="enter_group_name">Vnesi ime skupine</string>
     <string name="exportSuccessful">Podatkovna baza izvožena</string>
     <string name="importSuccessful">Podatkovna baza uvožena</string>
-    <string name="intent_import_card_from_url_share_text">Z vami želim deliti kartico</string>
+    <string name="intent_import_card_from_url_share_text">S tabo želim deliti kartico</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Prepreči zaklepanje zaslona</string>
-    <string name="settings_keep_screen_on">Ohranite zaslon vklopljen</string>
+    <string name="settings_keep_screen_on">Ohrani zaslon vklopljen</string>
     <string name="settings_dark_theme">Temno</string>
     <string name="settings_light_theme">Svetlo</string>
     <string name="settings_system_theme">Sistem</string>
     <string name="settings_theme">Tema</string>
     <string name="starImage">Zvezdica za priljubljene</string>
-    <string name="app_copyright_old">Bazira na podlagi aplikacije Loyalty Card Keychain
-\ncopyright © 2016-2020 Branden Archer</string>
+    <string name="app_copyright_old">Na podlagi aplikacije Loyalty Card Keychain \navtorske pravice © 2016-2020 Branden Archer</string>
     <string name="exportOptionExplanation">Podatki bodo zapisani na izbrano mesto.</string>
     <string name="failedParsingImportUriError">Ni bilo mogoče razčleniti URI uvoza</string>
-    <string name="share">Delite</string>
+    <string name="share">Deli</string>
     <string name="unstar">Odstrani iz priljubljenih</string>
     <string name="star">Dodaj med priljubljene</string>
     <string name="noBarcode">Brez črtne kode</string>
     <string name="barcodeType">Vrsta črtne kode</string>
-    <string name="noMatchingGiftCards">Brez rezultata iskanja. Poskusite spremeniti iskalni niz.</string>
-    <string name="action_search">Iskanje</string>
-    <string name="exportPasswordHint">Vnesite geslo</string>
-    <string name="exportPassword">Izberite geslo za zaščito izvoza (neobvezno)</string>
-    <string name="help_translate_this_app">Pomagajte pri prevajanju aplikacije</string>
+    <string name="noMatchingGiftCards">Brez rezultata iskanja. Poskusi spremeniti iskalni niz.</string>
+    <string name="action_search">Išči</string>
+    <string name="exportPasswordHint">Vnesi geslo</string>
+    <string name="exportPassword">Izberi geslo za zaščito izvoza (neobvezno)</string>
+    <string name="help_translate_this_app">Pomagaj pri prevajanju aplikacije</string>
     <string name="version_history">Zgodovina različic</string>
     <string name="settings_brown_theme">Rjava</string>
     <string name="settings_green_theme">Zelena</string>
@@ -93,53 +92,52 @@
     <string name="settings_locale">Jezik</string>
     <string name="barcodeImageDescriptionWithType">Slika <xliff:g>%s</xliff:g> črtna koda</string>
     <string name="sort_by">Razvrsti po</string>
-    <string name="reverse">...v obratnem vrstnem redu</string>
+    <string name="reverse">… v obratnem vrstnem redu</string>
     <string name="sort_by_expiry">Potek</string>
     <string name="sort_by_most_recently_used">Nazadnje uporabljene</string>
     <string name="sort_by_name">Ime</string>
     <string name="sort">Razvrsti</string>
     <string name="license">Licence</string>
     <string name="on_github">na GitHubu</string>
-    <string name="rate_this_app">Ocenite aplikacijo</string>
-    <string name="report_error">Prijavite napako</string>
-    <string name="on_google_play">na Trgovini Google Play</string>
+    <string name="rate_this_app">Oceni aplikacijo</string>
+    <string name="report_error">Prijavi napako</string>
+    <string name="on_google_play">v Trgovini Google Play</string>
     <string name="and_data_usage">in uporaba podatkov</string>
     <string name="source_repository">Izvorna koda</string>
     <string name="points">Točke</string>
     <string name="currency">Valuta</string>
-    <string name="balance">Stanje na računu</string>
+    <string name="balance">Stanje</string>
     <string name="errorReadingImage">Slike ni bilo mogoče prebrati</string>
     <string name="noBarcodeFound">Črtna koda ni bila najdena</string>
     <string name="balanceSentence">Stanje: <xliff:g>%s</xliff:g></string>
     <string name="chooseImportType">Uvozi podatke iz</string>
     <string name="importCatima">Izvoz iz aplikacije Catima</string>
-    <string name="importStocard">Izvoz iz aplikacije Stocard</string>
-    <string name="importVoucherVault">Izvoz iz aplikacije Voucher Vault</string>
+    <string name="importVoucherVault">Uvoz iz aplikacije Voucher Vault</string>
     <string name="privacy_policy">Politika zasebnosti</string>
-    <string name="turn_flashlight_off">Izklop svetilke</string>
-    <string name="turn_flashlight_on">Vklop svetilke</string>
-    <string name="passwordRequired">Vnesite geslo</string>
+    <string name="turn_flashlight_off">Izklopi svetilko</string>
+    <string name="turn_flashlight_on">Vklopi svetilko</string>
+    <string name="passwordRequired">Vnesi geslo</string>
     <string name="accept">Sprejmi</string>
-    <string name="importLoyaltyCardKeychain">Uvoz iz aplikacije Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychain">Uvoz iz aplikacije Kartice zvestobe</string>
     <string name="barcodeId">Vsebina črtne kode</string>
-    <string name="sameAsCardId">Enaka kot ID kartice</string>
+    <string name="sameAsCardId">Enaka kot Št. kartice</string>
     <string name="setBarcodeId">Nastavi vsebino črtne kode</string>
-    <string name="wrongValueForBarcodeType">Ta vrednost ni veljavna pri izbranem tipu čtne kode</string>
-    <string name="takePhoto">Naredi fotografijo</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Z vami želim deliti kartice zvestobe</string>
+    <string name="wrongValueForBarcodeType">Ta vrednost ni veljavna pri izbranem tipu črtne kode</string>
+    <string name="takePhoto">Slikaj</string>
+    <string name="intent_import_card_from_url_share_multiple_text">S tabo želim deliti kartice zvestobe</string>
     <string name="importFidme">Uvoz iz aplikacije FidMe</string>
     <string name="no">Ne</string>
     <string name="yes">Da</string>
     <string name="frontImageDescription">Prednja stran</string>
     <string name="backImageDescription">Zadnja stran</string>
-    <string name="setBackImage">Nastavi sliko sprednje strani</string>
+    <string name="setBackImage">Nastavi sliko zadnje strani</string>
     <string name="setFrontImage">Nastavi sliko sprednje strani</string>
     <string name="photos">Fotografije</string>
-    <string name="updateBarcodeQuestionText">Spremenili ste ID kartice. Želite posodobiti tudi črtno kodo na enako vrednost\?</string>
-    <string name="updateBarcodeQuestionTitle">Posodobi črtno kodo?</string>
+    <string name="updateBarcodeQuestionText">Spremenil si št. kartice. Želiš posodobiti tudi črtno kodo na enako vrednost?</string>
+    <string name="updateBarcodeQuestionTitle">Posodobiti črtno kodo?</string>
     <string name="removeImage">Odstrani sliko</string>
     <string name="unsupportedBarcodeType">Te vrste črtne kode aplikacija ne more prikazati. Morda bo to možno v prihodnosti.</string>
-    <string name="shortcutSelectCard">Izberite kartico</string>
+    <string name="shortcutSelectCard">Izberi kartico</string>
     <string name="starred">Priljubljene</string>
     <string name="include_if_asking_support">Ob zahtevani pomoči podpore je potrebno vključiti naslednje informacije:</string>
     <plurals name="balancePoints">
@@ -151,22 +149,22 @@
     <string name="editBarcode">Uredi črtno kodo</string>
     <string name="group_edit">Uredi skupino</string>
     <string name="never">Nikoli</string>
-    <string name="importCards">Uvozite kartice</string>
+    <string name="importCards">Uvozi kartice</string>
     <string name="currentBalanceSentence">Trenutno stanje: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Novo stanje: <xliff:g>%s</xliff:g></string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Kartice zvestobe</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> izbrana</item>
         <item quantity="two"><xliff:g>%d</xliff:g> izbrani</item>
         <item quantity="few"><xliff:g>%d</xliff:g> izbrane</item>
         <item quantity="other"><xliff:g>%d</xliff:g> izbranih</item>
     </plurals>
-    <string name="settings_card_orientation">Orientacija črtne kode</string>
+    <string name="settings_card_orientation">Orientacija zaslona</string>
     <string name="settings_follow_system_orientation">Sledi sistemu</string>
-    <string name="settings_portrait_orientation">Portret</string>
-    <string name="settings_landscape_orientation">Pokrajina</string>
+    <string name="settings_portrait_orientation">Pokončno</string>
+    <string name="settings_landscape_orientation">Ležeče</string>
     <string name="settings_lock_on_opening_orientation">Ohrani usmerjenost uporabljeno pri odpiranju kartice</string>
-    <string name="setIcon">Nastavite ikono</string>
+    <string name="setIcon">Nastavi sličico</string>
     <string name="showMoreInfo">Prikaži informacije</string>
     <string name="updateBalance">Posodobi stanje</string>
     <string name="failedToRetrieveImageFile">Slikovne datoteke ni bilo mogoče pridobiti</string>
@@ -176,15 +174,15 @@
     <string name="duplicateCard">Podvoji</string>
     <string name="archive">Arhiviraj</string>
     <string name="unarchive">Odpakiraj arhiv</string>
-    <string name="archived">Karta arhivirana</string>
+    <string name="archived">Kartica arhivirana</string>
     <string name="unarchived">Kartica ni arhivirana</string>
     <string name="failedLaunchingPhotoPicker">Ni mogoče najti podprte aplikacije za gledanje slik</string>
-    <string name="previousCard">Prejšnje</string>
-    <string name="nextCard">Naslednje</string>
-    <string name="updateBalanceTitle">Koliko ste porabili?</string>
-    <string name="updateBalanceHint">Vpišite vrednost</string>
+    <string name="previousCard">Prejšnja</string>
+    <string name="nextCard">Naslednja</string>
+    <string name="updateBalanceTitle">Koliko si porabil ali prejel?</string>
+    <string name="updateBalanceHint">Vpiši vrednost</string>
     <string name="group_name_already_in_use">Ime skupine je že uporabljeno</string>
-    <string name="group_name_is_empty">Ime skupine ne more biti prazno polje</string>
+    <string name="group_name_is_empty">Ime skupine ne sme biti prazno</string>
     <string name="group_updated">Skupina posodobljena</string>
     <string name="groupsList">Skupine: <xliff:g>%s</xliff:g></string>
     <string name="app_libraries">Proste knjižnice tretjih oseb: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@@ -194,29 +192,25 @@
     <string name="expiryDate">Datum poteka veljavnosti</string>
     <string name="chooseExpiryDate">Izberi datum poteka veljavnosti</string>
     <string name="moveBarcodeToTopOfScreen">Premakni črtno kodo na vrh zaslona</string>
-    <string name="importCatimaMessage">Izberi svoj obstoječ Catima <i>catima.zip</i> izvoz podatkov za uvoz v aplikacijo.
-\nNajprej izvozi podatke v meniju \"Uvozi/Izvozi\" v drugi aplikaciji Catima s pritiskom na izbiro izvozi.</string>
-    <string name="importStocardMessage">Izberi svoj <i>***.zip</i> Stocard izvoz podatkov za uvoz.
-\nIzvoz podatkov dobiš s pošiljanjem elektronske pošte na support@stocardapp.com, kjer povprašaš za izvoz svojih podatkov.</string>
-    <string name="importVoucherVaultMessage">Izberi svoj <i>vouchervault.json</i> Voucher Vault izvoz podatkov za uvoz.
-\nIzvoz podatkov dobiš s pritiskom na gumb \"Export\" v Voucher Vault first.</string>
-    <string name="failedToOpenUrl">Prvo namestite spletni brskalnik</string>
-    <string name="welcome">Pozdravljeni v Catimi</string>
-    <string name="noGiftCardsGroup">Kreiraj kartice in jim dodeli skupino tukaj.</string>
+    <string name="importCatimaMessage">Izberi svoj obstoječ Catima <i>catima.zip</i> izvoz podatkov za uvoz v aplikacijo. \nNajprej izvozi podatke v meniju \"Uvozi/Izvozi\" v drugi aplikaciji Catima s pritiskom na Izvozi.</string>
+    <string name="importVoucherVaultMessage">Izberi svoj <i>vouchervault.json</i> Voucher Vault izvoz podatkov za uvoz. \nIzvoz podatkov dobiš s pritiskom na gumb »Export« v Voucher Vault first.</string>
+    <string name="failedToOpenUrl">Prvo namesti spletni brskalnik</string>
+    <string name="welcome">Pozdravljen v Catimi</string>
+    <string name="noGiftCardsGroup">Ustvari kartice in jih dodeli tej skupini.</string>
     <plurals name="deleteCardsTitle">
-        <item quantity="one">Izbriši <xliff:g>%d</xliff:g> kartico zvestobe</item>
-        <item quantity="two">Izbriši <xliff:g>%d</xliff:g> kartici zvestobe</item>
-        <item quantity="few">Izbriši <xliff:g>%d</xliff:g> kartice zvestobe</item>
-        <item quantity="other">Izbriši <xliff:g>%d</xliff:g> kartic zvestobe</item>
+        <item quantity="one">Izbriši <xliff:g>%d</xliff:g> kartico</item>
+        <item quantity="two">Izbriši <xliff:g>%d</xliff:g> kartici</item>
+        <item quantity="few">Izbriši <xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other">Izbriši <xliff:g>%d</xliff:g> kartic</item>
     </plurals>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Izbriši to <xliff:g>%d</xliff:g> kartico zvestobe dokončno\?</item>
-        <item quantity="two">Izbriši ti dve <xliff:g>%d</xliff:g> kartici zvestobe dokončno\?</item>
-        <item quantity="few">Izbriši te <xliff:g>%d</xliff:g> kartice zvestobe dokončno\?</item>
-        <item quantity="other">Izbriši teh <xliff:g>%d</xliff:g> kartic zvestobe dokončno\?</item>
+        <item quantity="one">Izbriši to <xliff:g>%d</xliff:g> kartico dokončno?</item>
+        <item quantity="two">Izbriši ti dve <xliff:g>%d</xliff:g> kartici dokončno?</item>
+        <item quantity="few">Izbriši te <xliff:g>%d</xliff:g> kartice dokončno?</item>
+        <item quantity="other">Izbriši teh <xliff:g>%d</xliff:g> kartic dokončno?</item>
     </plurals>
     <string name="cameraPermissionDeniedTitle">Ni bilo mogoče dostopati do kamere</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Catima potrebuje dostop do vaše kamere za skeniranje črtnih kod. Pritisnite tukaj in spremenite nastavitve dovoljenj.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Catima potrebuje dostop do vaše kamere za skeniranje črtnih kod. Pritisni tukaj in spremeni nastavitve dovoljenj.</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> kartica</item>
         <item quantity="two"><xliff:g>%d</xliff:g> kartici</item>
@@ -224,13 +218,11 @@
         <item quantity="other"><xliff:g>%d</xliff:g> kartic</item>
     </plurals>
     <string name="editGroup">Urejanje skupine: <xliff:g>%s</xliff:g></string>
-    <string name="importFidmeMessage">Izberi svoj <i>fidme-export-request-xxxxxx.zip</i> FidMe izvoz podatkov za uvoz in naknadno ročno izberi tipe črtnih kod.
-\nFidMe izvoz podatkov naredi v svojem FidMe profilu z izbiro \"Data Protection\" in nato s pritiskom na gumb \"Extract my data first\".</string>
-    <string name="importLoyaltyCardKeychainMessage">Izberi svoj <i>LoyaltyCardKeychain.csv</i> Loyalty Card Keychain izvoz podatkov za uvoz.
-\nLoyalty Card Keychain izvoz podatkov naredi s pritiskom na gumb \"Import/Export\" v meniju s pritiskom najprej na gumb \"Export\".</string>
-    <string name="failedGeneratingShareURL">URL-ja za skupno rabo ni bilo mogoče ustvariti. Prosim prijavite napako.</string>
+    <string name="importFidmeMessage">Izberi svoj <i>fidme-export-request-xxxxxx.zip</i> FidMe izvoz podatkov za uvoz in naknadno ročno izberi tipe črtnih kod. \nFidMe izvoz podatkov naredi v svojem FidMe profilu z izbiro »Data Protection« in nato s pritiskom na gumb »Extract my data first«.</string>
+    <string name="importLoyaltyCardKeychainMessage">Izberi svoj <i>LoyaltyCardKeychain.csv</i> Kartice zvestobe izvoz podatkov za uvoz. \nKartice zvestobe izvoz podatkov naredi s pritiskom na gumb »Import/Export« v meniju s pritiskom najprej na gumb »Export«.</string>
+    <string name="failedGeneratingShareURL">URL-ja za skupno rabo ni bilo mogoče ustvariti. Prosim prijavi napako.</string>
     <string name="settings_oled_dark">Čisto črno ozadje za temno temo</string>
-    <string name="selectColor">Izberite barvo</string>
+    <string name="selectColor">Izberi barvo</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="app_contributors">Omogočeno od: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeLongPressMessage">V aplikaciji za gledanje slik lahko odpremo samo slike</string>
@@ -240,16 +232,86 @@
         <item quantity="few"><xliff:g>%1$d</xliff:g> kartice (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirane)</item>
         <item quantity="other"><xliff:g>%1$d</xliff:g> kartic (<xliff:g id="archivedCount">%2$d</xliff:g> arhiviranih)</item>
     </plurals>
-    <string name="cameraPermissionRequired">Za to dejanje je potrebno dovoljenje za dostop do kamere…</string>
-    <string name="storageReadPermissionRequired">Za to dejanje je potrebno dovoljenje za branje iz pomnilnika…</string>
+    <string name="cameraPermissionRequired">Za to dejanje je potrebno dovoljenje za dostop do kamere …</string>
+    <string name="storageReadPermissionRequired">Za to dejanje je potrebno dovoljenje za branje iz pomnilnika …</string>
     <string name="validFromSentence">Veljavno od: <xliff:g>%s</xliff:g></string>
     <string name="validFromDate">Velja od</string>
     <string name="anyDate">Katerikoli datum</string>
-    <string name="chooseValidFromDate">Izberite datum začetka veljavnosti</string>
-    <string name="permissionReadCardsDescription">preberite svoje kartice Catima in vse podrobnosti, vključno z opombami in slikami</string>
+    <string name="chooseValidFromDate">Izberi datum začetka veljavnosti</string>
+    <string name="permissionReadCardsDescription">preberi svoje kartice Catima in vse podrobnosti, vključno z opombami in slikami</string>
     <string name="settings_display_barcode_max_brightness_summary">Potrebno za delovanje nekaterih skenerjev</string>
-    <string name="app_copyright_short">Copyright © Sylvia van Os in drugi sodelujoči</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os in drugi sodelujoči</string>
-    <string name="permissionReadCardsLabel">Preberite kartice Catima</string>
+    <string name="app_copyright_short">Avtorske pravice © Sylvia van Os in drugi sodelujoči</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Avtorske pravice © 2019–<xliff:g>%d</xliff:g> Sylvia van Os in drugi sodelujoči</string>
+    <string name="permissionReadCardsLabel">Preberi kartice Catima</string>
     <string name="app_name">Catima</string>
+    <string name="settings_follow_sensor_orientation">Vedno obrni (prezri sistemske nastavitve)</string>
+    <string name="settings_keep_screen_on_summary">Med ogledom kartice ohrani vključen zaslon</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">Med ogledom kartice onemogoči zaklepanje zaslona</string>
+    <string name="settings_allow_content_provider_read_title">Dovoli drugim aplikacijam dostop do mojih podatkov</string>
+    <string name="settings_allow_content_provider_read_summary">Aplikacije bodo morale še vedno zahtevati dovoljenje za dostop</string>
+    <string name="settings_use_volume_keys_navigation">Preklopi kartice z uporabo gumbov za glasnost</string>
+    <string name="settings_use_volume_keys_navigation_summary">Uporabi gumbe za glasnost za preklop prikazane kartice</string>
+    <string name="donate">Daruj</string>
+    <string name="icon_header_click_text">Dolgi pritisk za urejanje sličice</string>
+    <string name="show_name_below_image_thumbnail">Prikaži ime pod sličico</string>
+    <string name="show_note">Pokaži opombo</string>
+    <string name="show_balance">Pokaži stanje</string>
+    <string name="show_validity">Pokaži veljavnost</string>
+    <string name="settings_category_title_cards">Pogled kartice</string>
+    <string name="settings_category_title_cards_overview">Pregled kartic</string>
+    <string name="settings_column_count_portrait">Stolpci v pokončnem načinu</string>
+    <string name="settings_column_count_landscape">Stolpci v ležečem načinu</string>
+    <string name="settings_automatic_column_count">Avtomatsko</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_category_title_general">Splošno</string>
+    <string name="settings_category_title_privacy">Zasebnost</string>
+    <string name="action_display_options">Možnosti prikaza</string>
+    <string name="show_archived_cards">Pokaži arhivirane kartice</string>
+    <string name="view_online">Ogled na spletu</string>
+    <string name="action_more_options">Več možnosti</string>
+    <string name="addWithoutBarcode">Dodaj kartico brez črtne kode</string>
+    <string name="enter_card_id">Vnesi identifikacijsko številko ali besedilo na kartici</string>
+    <string name="card_id_must_not_be_empty">Št. kartice ne sme biti prazna</string>
+    <string name="add_a_card_in_a_different_way">Dodaj kartico na drugačen način</string>
+    <string name="field_must_not_be_empty">Polje ne sme biti prazno</string>
+    <string name="manually_enter_barcode_instructions">Vnesi identifikacijsko številko ali besedilo na kartici in pritisni črtno kodo, ki je podobna tisti na kartici.</string>
+    <string name="add_manually_warning_title">Priporočljivo je skeniranje</string>
+    <string name="add_manually_warning_message">V nekaterih trgovinah se vrednost črtne kode razlikuje od številke, napisane na kartici. Zaradi tega ročno vnašanje črtne kode morda ne bo vedno delovalo. Priporočamo, da črtno kodo raje skeniraš s kamero. Želiš nadaljevati?</string>
+    <string name="continue_">Nadaljuj</string>
+    <string name="spend">Porabi</string>
+    <string name="receive">Prejmi</string>
+    <string name="amountParsingFailed">Neveljaven znesek</string>
+    <string name="addFromPdfFile">Izberi PDF datoteko</string>
+    <string name="errorReadingFile">Datoteke ni mogoče prebrati</string>
+    <string name="failedLaunchingFileManager">Ni bilo mogoče najti podprtega upravitelja datotek</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Katero od najdenih črtnih kod želiš uporabiti?</string>
+    <string name="pageWithNumber">Stran <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Tvoja naprava očitno nima kamere. Če jo ima, poskusi ponovno zagnati napravo. V nasprotnem primeru uporabi spodnji gumb Več možnosti, da dodaš črtno kodo na drug način.</string>
+    <string name="importCancelled">Uvoz preklican</string>
+    <string name="exportCancelled">Izvoz preklican</string>
+    <string name="balanceParsingFailed">Neveljavno stanje</string>
+    <string name="settings_oled_dark_summary">Zmanjša porabo baterije na OLED zaslonih</string>
+    <string name="sort_by_valid_from">Velja od</string>
+    <string name="height">Višina</string>
+    <string name="switchToFrontImage">Preklopi na prednjo sliko</string>
+    <string name="switchToBackImage">Preklopi na zadnjo sliko</string>
+    <string name="switchToBarcode">Preklopi na črtno kodo</string>
+    <string name="openFrontImageInGalleryApp">Odpri sprednjo sliko v galeriji</string>
+    <string name="openBackImageInGalleryApp">Odpri zadnjo sliko v galeriji</string>
+    <string name="setBarcodeHeight">Nastavi višino črtne kode</string>
+    <string name="useFrontImage">Uporabi prednjo sliko</string>
+    <string name="useBackImage">Uporabi zadnjo sliko</string>
+    <string name="addFromPkpass">Izberi Passbook datoteko (.pkpass)</string>
+    <string name="unsupportedFile">Ta datoteka ni podprta</string>
+    <string name="generic_error_please_retry">Žal se je pojavila napaka, poskusi znova …</string>
+    <string name="width">Širina</string>
+    <string name="card_list_widget_name">Seznam kartic</string>
+    <string name="setBarcodeWidth">Nastavi širino črtne kode</string>
+    <string name="card_list_widget_empty">Ko v Catimi dodaš nekaj kartic zvestobe, se bodo te prikazale tukaj. Če imaš kartice, se prepričaj, da niso vse arhivirane.</string>
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -107,7 +107,6 @@
     <string name="importLoyaltyCardKeychain">Uvezi iz aplikacije Loyalty Card Keychain</string>
     <string name="importLoyaltyCardKeychainMessage">Odaberi svoj <i>LoyaltyCardKeychain.csv</i> izvoz iz aplikacije Loyalty Card Keychain za uvoz.
 \nKreiraj ga iz menija \"Import/Export\" u aplikaciji Loyalty Card Keychain klikom na \"Export\".</string>
-    <string name="importStocard">Uvoz iz Stocard</string>
     <string name="importVoucherVault">Uvoz iz Voucher Vault</string>
     <string name="importVoucherVaultMessage">Odaberi svoj <i>vouchervault.json</i> izvoz iz Voucher Vault za uvoz.
 \nKreiraj ga pritiskom na \"Export\" u Voucher Vault aplikaciji.</string>
@@ -250,8 +249,6 @@
 \nMožeš da ga kreiraš u Catima aplikaciji koju prenosiš iz menija Uvoz/Izvoz aplikacije pritiskom na izvoz.</string>
     <string name="importFidmeMessage">Odaberi svoj <i>fidme-export-request-xxxxxx.zip</i> izvoz iz FidMe za uvoz, a zatim ručno izaberite tipove bar-kodova.
 \nKreirajte ga iz svog FidMe profila tako što ćeš izabrati \"Data Protection\", a zatim pritisnuti \"Extract my data first\".</string>
-    <string name="importStocardMessage">Odaberi svoj <i>***.zip</i> izvoz iz Stocard za uvoz.
-\nNabavi ga putem e-mail adrese support@stocardapp.com tražeći izvoz vaših podataka.</string>
     <string name="backImageDescription">Zadnja fotografija kartice</string>
     <string name="setBackImage">Postavi zadnju fotografiju</string>
     <string name="passwordRequired">Unesi lozinku</string>
@@ -314,4 +311,6 @@
     <string name="settings_column_count_3">3</string>
     <string name="settings_column_count_4">4</string>
     <string name="addFromPkpass">Izaberi \"Passbook\" dokument (.pkpass)</string>
+    <string name="card_list_widget_name">Lista kartica</string>
+    <string name="card_list_widget_empty">Nakon što dodate neke kartice lojalnosti u Catima, one će se pojaviti ovde. Ako imate kartice, uverite se da nisu sve arhivirane.</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -19,8 +19,6 @@
 \nSkapa den från Import/Export-menyn i Loyalty Card Keychain först genom att trycka på Exportera.</string>
     <string name="importVoucherVaultMessage">Välj den exporterade <i>vouchervault.json</i> från Voucher Vault som du vill importera.
 \nSkapa den först genom att trycka på Exportera i Voucher Vault.</string>
-    <string name="importStocardMessage">Välj den exporterade <i>***.zip</i> från Stocard som du vill importera.
-\nSkaffa den först genom att skicka e-post till support@stocardapp.com och be om att få dina data exporterade.</string>
     <string name="enter_group_name">Ange gruppnamn</string>
     <string name="groups">Grupper</string>
     <plurals name="groupCardCount">
@@ -47,7 +45,6 @@
     <string name="importCatima">Importera från Catima</string>
     <string name="importFidme">Importera från FidMe</string>
     <string name="importLoyaltyCardKeychain">Importera från Loyalty Card Keychain</string>
-    <string name="importStocard">Importera from Stocard</string>
     <string name="importVoucherVault">Importera från Voucher Vault</string>
     <string name="barcodeId">Streckkodsvärde</string>
     <string name="passwordRequired">Var snäll och ange lösenordet</string>

app/src/main/res/values-ta/strings.xml

@@ -147,9 +147,7 @@
     <string name="importCatimaMessage">நீங்கள் கேட்டிமாவில் இருந்து ஏற்றுமதி செய்த <i> catima.zip </i> தேர்ந்துஎடுத்து இறக்குமதி செய்யுங்கள்.\nமுதலில் மற்றொரு கேட்டிமா செயலியில் இறக்குமதி/ஏற்றுமதி மெனுவிலிருந்து ஏற்றுமதியை தேர்ந்துஎடுத்து இக்கோப்பை உருவாக்கவும்.</string>
     <string name="importLoyaltyCardKeychain">விசுவாச அட்டை கீச்சினிலிருந்து இறக்குமதி செய்யுங்கள்</string>
     <string name="importFidmeMessage">உங்கள் <i> fidme-export-request-xxxxxx.zip </i> இறக்குமதி செய்ய FIDME இலிருந்து ஏற்றுமதி செய்து, பின்னர் பார்கோடு வகைகளை கைமுறையாகத் தேர்ந்தெடுக்கவும்.\n தரவு பாதுகாப்பைத் தேர்ந்தெடுப்பதன் மூலம் உங்கள் FIDME சுயவிவரத்திலிருந்து அதை உருவாக்கவும், பின்னர் எனது தரவைப் பிரித்தெடுக்கவும் அழுத்தவும்.</string>
-    <string name="importStocardMessage">உங்கள் <i> ***. சிப் </i> இறக்குமதி செய்ய ஏற்றுமதி.\n உங்கள் தரவை ஏற்றுமதி செய்யக் கேட்கும் support@stocardapp.com என்ற மின்னஞ்சல் மூலம் அதைப் பெறுங்கள்.</string>
     <string name="importVoucherVault">வவுச்சர் பெட்டகத்திலிருந்து இறக்குமதி</string>
-    <string name="importStocard">ச்டார்ட் இருந்து இறக்குமதி</string>
     <string name="sameAsCardId">ஐடி அதே</string>
     <string name="setBarcodeId">பார்கோடு மதிப்பை அமைக்கவும்</string>
     <string name="unsupportedBarcodeType">இந்த பார்கோடு வகையை இன்னும் காட்ட முடியாது. பயன்பாட்டின் பின்னர் பதிப்பில் இது ஆதரிக்கப்படலாம்.</string>

app/src/main/res/values-tr/strings.xml

@@ -36,9 +36,6 @@
     <string name="importVoucherVaultMessage">İçe aktarmak için Voucher Vault\'tan dışa aktardığınız <i>vouchervault.json</i> dosyasını seçin.
 \nÖnce Voucher Vault\'ta \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
     <string name="importVoucherVault">Voucher Vault\'tan içe aktar</string>
-    <string name="importStocardMessage">İçe aktarmak için Stocard\'dan dışa aktardığınız <i>***.zip</i> dosyasını seçin.
-\nsupport@stocardapp.com adresine e-posta göndererek verilerinizin dışa aktarılmasını isteyerek edinin.</string>
-    <string name="importStocard">Stocard\'dan içe aktar</string>
     <string name="importLoyaltyCardKeychainMessage">İçe aktarmak için Loyalty Card Keychain\'den dışa aktardığınız <i>LoyaltyCardKeychain.csv</i> dosyasını seçin.
 \nLoyalty Card Keychain uygulamasının İçe/Dışa aktar menüsündeki \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
     <string name="importLoyaltyCardKeychain">Loyalty Card Keychain\'den içe aktar</string>
@@ -310,4 +307,6 @@
     <string name="setBarcodeWidth">Barkod Genişliğini Ayarla</string>
     <string name="card_list_widget_name">Kart listesi</string>
     <string name="card_list_widget_empty">Catima\'ya sadakat kartları eklediğinizde, burada gözükecekler. Eğer kartlarınız varsa, arşivlemediğinizden emin olun.</string>
+    <string name="cardWithNumber">Kart <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Kart <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -134,8 +134,6 @@
     <string name="photos">Світлини</string>
     <string name="backImageDescription">Тильна сторона</string>
     <string name="frontImageDescription">Лицьова сторона</string>
-    <string name="importStocardMessage">Виберіть експорт <i> ***.zip </i> з Stocard для імпорту.\nОтримайте його, надіславши електронного листа support@stocardapp.com з проханням експортувати ваші дані.</string>
-    <string name="importStocard">Імпорт з Stocard</string>
     <plurals name="selectedCardCount">
         <item quantity="one">Обрано: <xliff:g>%d</xliff:g></item>
         <item quantity="few">Обрані: <xliff:g>%d</xliff:g></item>
@@ -315,10 +313,12 @@
     <string name="settings_column_count_1">1</string>
     <string name="unsupportedFile">Цей файл не підтримується</string>
     <string name="generic_error_please_retry">Вибачте, щось пішло не так, спробуйте ще раз...</string>
-    <string name="addFromPkpass">Виберіть файл Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Виберіть файл Passbook (.pkpass / .pkpasses)</string>
     <string name="sort_by_valid_from">Діє з</string>
     <string name="width">Ширина</string>
     <string name="setBarcodeWidth">Встановити ширину штрих-коду</string>
     <string name="card_list_widget_name">Список карток</string>
     <string name="card_list_widget_empty">Після того, як ви додасте кілька карток лояльності в Catima, вони з’являться тут. Якщо у вас є картки, переконайтеся, що вони не всі заархівовані.</string>
+    <string name="cardWithNumber">Картка <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Картка <xliff:g>%d</xliff:g> (%s)</string>
 </resources>

app/src/main/res/values-vi/strings.xml

@@ -25,7 +25,6 @@
     <string name="cameraPermissionDeniedTitle">Không sử dụng được camera</string>
     <string name="wrongValueForBarcodeType">Giá trị cho loại mã vạch này không hợp lệ</string>
     <string name="expiryDate">Ngày hết hạn</string>
-    <string name="importStocard">Nhập dữ liệu từ Stocard</string>
     <string name="currency">Tiền tệ</string>
     <string name="welcome">Chào mừng tới Catima</string>
     <string name="failedParsingImportUriError">Không thể phân tích URI được cung cấp</string>
@@ -152,8 +151,6 @@
     <string name="settings_landscape_orientation">Ngang</string>
     <string name="privacy_policy">Chính Sách Quyền Riêng Tư</string>
     <string name="enter_group_name">Nhập tên nhóm</string>
-    <string name="importStocardMessage">Chọn <i>***.zip</i> được xuất từ Stocard để nhập liệu.
-\nLấy tập tin này bằng cách gửi thư yêu cầu xuất dữ liệu đến support@stocardapp.com.</string>
     <string name="addCardTitle">Thêm Thẻ</string>
     <string name="exportFailed">Không thể xuất dữ liệu</string>
     <string name="exportName">Xuất dữ liệu</string>